diff options
| author | Robin Burchell <robin.burchell@collabora.co.uk> | 2012-07-02 10:23:12 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-03 00:03:31 +0200 |
| commit | 43a22ee83e639ea4b672942249d300fa41c75fa6 (patch) | |
| tree | 867db0d0e290fce9182772fae554d062ad16cf27 /mkspecs | |
| parent | 56df16fe4b9d188b712956e3bf1d579246a04fc9 (diff) | |
android: fix stupid thinko where cflags were set before the common include
this meant that the common mkspec was unable to do 'sensible' things with the
cflags (hence -Wno-psabi not being applied to C++ code), and probably explains a
lot of other weird things.
Change-Id: I77079027dc1b2691c53212893eb90c7b935d00a2
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'mkspecs')
3 files changed, 6 insertions, 9 deletions
diff --git a/mkspecs/unsupported/linux-android-armeabi-g++/qmake.conf b/mkspecs/unsupported/linux-android-armeabi-g++/qmake.conf index ef5594e3a4..ea988d3a51 100644 --- a/mkspecs/unsupported/linux-android-armeabi-g++/qmake.conf +++ b/mkspecs/unsupported/linux-android-armeabi-g++/qmake.conf @@ -6,10 +6,9 @@ ANDROID_TARGET_ARCH = armeabi ANDROID_ARCHITECTURE = arm ANDROID_NDK_TOOLCHAIN_PREFIX = arm-linux-androideabi ANDROID_NDK_TOOLS_PREFIX = arm-linux-androideabi - -include(../../common/linux-android.conf) - QMAKE_CFLAGS = -Wno-psabi -march=armv5te -mtune=xscale -msoft-float -fpic -ffunction-sections -funwind-tables -fstack-protector -fno-short-enums -DANDROID -Wa,--noexecstack QMAKE_CFLAGS_RELEASE = -g -mthumb -Os -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 QMAKE_CFLAGS_DEBUG = -g -marm -O0 -fno-omit-frame-pointer +include(../../common/linux-android.conf) + diff --git a/mkspecs/unsupported/linux-android-armeabi-v7a-g++/qmake.conf b/mkspecs/unsupported/linux-android-armeabi-v7a-g++/qmake.conf index 91e0c4cb72..70445a536f 100644 --- a/mkspecs/unsupported/linux-android-armeabi-v7a-g++/qmake.conf +++ b/mkspecs/unsupported/linux-android-armeabi-v7a-g++/qmake.conf @@ -6,10 +6,9 @@ ANDROID_TARGET_ARCH = armeabi-v7a ANDROID_ARCHITECTURE = arm ANDROID_NDK_TOOLCHAIN_PREFIX = arm-linux-androideabi ANDROID_NDK_TOOLS_PREFIX = arm-linux-androideabi - -include(../../common/linux-android.conf) - QMAKE_CFLAGS = -Wno-psabi -march=armv7-a -mfloat-abi=softfp -mfpu=vfp -fpic -ffunction-sections -funwind-tables -fstack-protector -fno-short-enums -DANDROID -Wa,--noexecstack QMAKE_CFLAGS_RELEASE = -g -mthumb -Os -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 QMAKE_CFLAGS_DEBUG = -g -marm -O0 -fno-omit-frame-pointer +include(../../common/linux-android.conf) + diff --git a/mkspecs/unsupported/linux-android-x86-g++/qmake.conf b/mkspecs/unsupported/linux-android-x86-g++/qmake.conf index 9550e1ae46..5a51704b38 100644 --- a/mkspecs/unsupported/linux-android-x86-g++/qmake.conf +++ b/mkspecs/unsupported/linux-android-x86-g++/qmake.conf @@ -6,10 +6,9 @@ ANDROID_TARGET_ARCH = x86 ANDROID_ARCHITECTURE = x86 ANDROID_NDK_TOOLCHAIN_PREFIX = x86 ANDROID_NDK_TOOLS_PREFIX = i686-android-linux - -include(../../common/linux-android.conf) - QMAKE_CFLAGS = -ffunction-sections -funwind-tables -O2 -fomit-frame-pointer -fstrict-aliasing -funswitch-loops -finline-limit=300 -DANDROID -Wa,--noexecstack QMAKE_CFLAGS_RELEASE = -g -O2 QMAKE_CFLAGS_DEBUG = -g +include(../../common/linux-android.conf) + |