From 4749a3ec61859e324f14add3008c41f92e6c2793 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Tue, 19 Feb 2019 08:38:07 +0100 Subject: Android: Use -marm instead of -mthumb for armv7 to avoid a crash Since the Android toolchain has problems with using -mthumb for QtScript then we switch it to using -marm instead in order to prevent problems from occurring as a result. Since this is only a problem for the armv7 architecture then we only do this for that architecture. Change-Id: Ia621f066b8336bb12a2ec1aa99e3a9f9afca186d Done-with: Markus Maier Fixes: QTBUG-67936 Reviewed-by: Markus Maier Reviewed-by: BogDan Vatra --- src/script/script.pro | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/script/script.pro b/src/script/script.pro index 228f486..c5d56c2 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -63,3 +63,14 @@ load(qt_module) # Override the module default, as it breaks compilation with libc++>=5.0: # auto_ptr is no longer part of the c++1z standard. CONFIG -= c++1z + +android-clang:equals(ANDROID_TARGET_ARCH, armeabi-v7a) { + QMAKE_CFLAGS_RELEASE -= -mthumb + QMAKE_CFLAGS_RELEASE *= -marm + QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO -= -mthumb + QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO *= -marm + QMAKE_CXXFLAGS_RELEASE -= -mthumb + QMAKE_CXXFLAGS_RELEASE *= -marm + QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO -= -mthumb + QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO *= -marm +} -- cgit v1.2.1