diff options
author | BogDan Vatra <bogdan@kde.org> | 2013-08-14 14:22:25 +0300 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-22 21:34:35 +0200 |
commit | b4252802b3a537268b83855d2e13390bd5aedf5c (patch) | |
tree | 6eae3188f19bf27897aa8ef83ed1d4b16d270f7f /mkspecs/android-g++ | |
parent | 9863188431c0a3d580f034b66ac0eb1f7dc57588 (diff) |
Switch back to thumb for android armeabi.
Add workaround for gcc 4.8 compile bug.
Change-Id: Ie7a81ec25a79764989bbd9eb43dd5a8fbf442dfc
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs/android-g++')
-rw-r--r-- | mkspecs/android-g++/qmake.conf | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf index 0afea12e60..f08132151c 100644 --- a/mkspecs/android-g++/qmake.conf +++ b/mkspecs/android-g++/qmake.conf @@ -109,13 +109,11 @@ equals(ANDROID_TARGET_ARCH, x86) { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO = -g -O2 QMAKE_CFLAGS_DEBUG = -g -fno-omit-frame-pointer } else { # arm - QMAKE_CFLAGS_RELEASE = -Os -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 - QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO = -g -Os -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 - equals(ANDROID_TARGET_ARCH, armeabi-v7a) { - QMAKE_CFLAGS_RELEASE += -mthumb - QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -mthumb - } + QMAKE_CFLAGS_RELEASE = -mthumb -Os -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 + QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO = -g -mthumb -Os -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 QMAKE_CFLAGS_DEBUG = -g -marm -O0 -fno-omit-frame-pointer + equals(ANDROID_TARGET_ARCH, armeabi): equals(NDK_TOOLCHAIN_VERSION, 4.8): \ + DEFINES += QT_OS_ANDROID_GCC_48_WORKAROUND } QMAKE_CFLAGS_SHLIB = -fPIC |