summaryrefslogtreecommitdiff
path: root/platform/android
diff options
context:
space:
mode:
authorPedro J. Estébanez <pedrojrulez@gmail.com>2017-04-05 22:16:04 +0200
committerPedro J. Estébanez <pedrojrulez@gmail.com>2017-04-05 22:18:16 +0200
commit2443946307bbeb86c010655dd760fb97d21f75f4 (patch)
tree11999f65f2f06033f78450de12f783da80330ddd /platform/android
parent65f8210e503dd6cc8fdfcae7de5cb7d9a1bed854 (diff)
Fix crash on Android-x86
Diffstat (limited to 'platform/android')
-rw-r--r--platform/android/detect.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py
index 0e78a4618d..8d2ed59f17 100644
--- a/platform/android/detect.py
+++ b/platform/android/detect.py
@@ -175,6 +175,8 @@ def configure(env):
if env['android_arch'] == 'x86':
can_vectorize = True
target_opts = ['-target', 'i686-none-linux-android']
+ # The NDK adds this if targeting API < 21, so we can drop it when Godot targets it at least
+ env.Append(CPPFLAGS=['-mstackrealign'])
elif env["android_arch"] == "armv6":
can_vectorize = False
target_opts = ['-target', 'armv6-none-linux-androideabi']