summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-05-19 19:42:31 +0200
committerGitHub <noreply@github.com>2021-05-19 19:42:31 +0200
commit9004943559cdcbe4bdf455f11d9602fa377d938a (patch)
tree23ce9b7c5c84bd7492655689a27a236588dc7309 /platform
parent6cc6930ee9b9a77e64f4dc60b64c76f41ef6c48d (diff)
parent23f7c751268a5cd75494d1ac24b7e585502d8134 (diff)
Merge pull request #48851 from akien-mga/android-remove-fno-integrated-as
Android: Remove `-fno-integrated-as`, it can break arm64v8 build
Diffstat (limited to 'platform')
-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