summaryrefslogtreecommitdiff
path: root/platform/android/detect.py
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2021-05-19 18:55:36 +0200
committerRémi Verschelde <rverschelde@gmail.com>2021-05-19 18:55:43 +0200
commit23f7c751268a5cd75494d1ac24b7e585502d8134 (patch)
treeba882d198509e15a9a6b191f1e79263c33c3fd8c /platform/android/detect.py
parentf1f5b92b8e84541759e7dc38aa85da036027ba06 (diff)
Android: Remove `-fno-integrated-as`, it can break arm64v8 build
We found that this flag causes this error on PR #48812 which does not add any fancy inline assembly: ``` /tmp/tile_set-ce236a.s: Assembler messages: /tmp/tile_set-ce236a.s:34676: Error: selected processor does not support `bfc x0,#32,#32' clang++: error: assembler command failed with exit code 1 (use -v to see invocation) ``` That flag is mentioned in various errors related to assembler failures on arm64v8 with Clang from the Android NDK. It was added in Godot in #6958 when migrating from GCC to Clang, and is indeed referenced in the NDK's Clang migration guide: https://android.googlesource.com/platform/ndk/+/master/docs/ClangMigration.md > Especially for ARM and ARM64, Clang is much stricter about assembler rules > than GCC/GAS. Use `-fno-integrated-as` if Clang reports errors in inline > assembly or assembly files that you don't wish to modernize. We don't get those errors nowadays so it seems the flag is no longer needed.
Diffstat (limited to 'platform/android/detect.py')
-rw-r--r--platform/android/detect.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py
index 8808b032a6..1b6af8662e 100644
--- a/platform/android/detect.py
+++ b/platform/android/detect.py
@@ -250,7 +250,7 @@ def configure(env):
env["RANLIB"] = tools_path + "/ranlib"
env["AS"] = tools_path + "/as"
- common_opts = ["-fno-integrated-as", "-gcc-toolchain", gcc_toolchain_path]
+ common_opts = ["-gcc-toolchain", gcc_toolchain_path]
# Compile flags