whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Robin Burchell 2012-07-02 10:23:12 +02:00 committed by Qt by Nokia
parent 56df16fe4b
commit 43a22ee83e
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mkspecs/unsupported/linux-android-armeabi-g++/qmake.conf
View File

@ -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)

5
mkspecs/unsupported/linux-android-armeabi-v7a-g++/qmake.conf
View File

@ -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)

5
mkspecs/unsupported/linux-android-x86-g++/qmake.conf
View File

@ -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)