diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-04-05 22:27:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-05 22:27:48 +0200 |
| commit | 64ebc3672e28b337b5700c7b9ef96c3422bb7491 (patch) | |
| tree | 3d80f075d23b6811865cdba3219a2a4f0d89b09b /platform | |
| parent | 454f53c77659721a529c48fd4be6bf80d33c0082 (diff) | |
| parent | 2443946307bbeb86c010655dd760fb97d21f75f4 (diff) | |
Merge pull request #8274 from RandomShaper/fix-android-x86
Fix crash on Android-x86
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/detect.py | 2 |
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'] |