diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-03-11 14:54:06 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-12 18:13:37 +0100 |
| commit | ae39a84603a91a7de8dbc23e677827bcdb12e996 (patch) | |
| tree | 94c836417ebe995e2e318ef0164477fb12d618e0 /mkspecs | |
| parent | bb2d95ce4321d119621961aa1c383e614ececa0a (diff) | |
iOS: Move arch handling out of ios.prf now that we have default_post.prf
Change-Id: Ifad6463414d4fb055007653d06f2c17ca5ee953e
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/ios.prf | 25 | ||||
| -rw-r--r-- | mkspecs/features/ios/default_post.prf | 26 |
2 files changed, 26 insertions, 25 deletions
diff --git a/mkspecs/features/ios.prf b/mkspecs/features/ios.prf deleted file mode 100644 index 841378e8dd..0000000000 --- a/mkspecs/features/ios.prf +++ /dev/null @@ -1,25 +0,0 @@ -isEmpty(QT_ARCH) { - # The iPhoneOS and iPhoneSimulator targets share the same toolchain, - # so when configure runs the arch tests it passes the correct sysroot, - # but we fail to pick up the architecture since we're not passing -arch - # yet. Xcode does not seem to have a way to run the shared toolchain - # in a way that will automatically do this (for example xcrun -sdk). - contains(QMAKE_MAC_SDK, iphoneos.*): QT_ARCH = armv7 - else: QT_ARCH = i386 # Simulator -} else { - # Fix up the QT_ARCH to be more specific - equals(QT_ARCH, arm) { - # Samsung S5PC100, Apple A4, A5, A5X - QT_ARCH = armv7 - - # FIXME: How do we support armv7s when Qt can't do universal builds? - } -} - -!equals(MAKEFILE_GENERATOR, XCODE) { - arch_flag = -arch $$QT_ARCH - QMAKE_CFLAGS += $$arch_flag - QMAKE_CXXFLAGS += $$arch_flag - QMAKE_OBJECTIVE_CFLAGS += $$arch_flag - QMAKE_LFLAGS += $$arch_flag -} diff --git a/mkspecs/features/ios/default_post.prf b/mkspecs/features/ios/default_post.prf index f5e7b3c02d..e9d2149351 100644 --- a/mkspecs/features/ios/default_post.prf +++ b/mkspecs/features/ios/default_post.prf @@ -40,4 +40,30 @@ contains(MAKEFILE_GENERATOR, XCODE) { QMAKE_MAC_XCODE_SETTINGS += ios_device_family } +isEmpty(QT_ARCH) { + # The iPhoneOS and iPhoneSimulator targets share the same toolchain, + # so when configure runs the arch tests it passes the correct sysroot, + # but we fail to pick up the architecture since we're not passing -arch + # yet. Xcode does not seem to have a way to run the shared toolchain + # in a way that will automatically do this (for example xcrun -sdk). + contains(QMAKE_MAC_SDK, iphoneos.*): QT_ARCH = armv7 + else: QT_ARCH = i386 # Simulator +} else { + # Fix up the QT_ARCH to be more specific + equals(QT_ARCH, arm) { + # Samsung S5PC100, Apple A4, A5, A5X + QT_ARCH = armv7 + + # FIXME: How do we support armv7s when Qt can't do universal builds? + } +} + +!equals(MAKEFILE_GENERATOR, XCODE) { + arch_flag = -arch $$QT_ARCH + QMAKE_CFLAGS += $$arch_flag + QMAKE_CXXFLAGS += $$arch_flag + QMAKE_OBJECTIVE_CFLAGS += $$arch_flag + QMAKE_LFLAGS += $$arch_flag +} + load(default_post) |