diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2014-10-24 17:43:18 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2014-10-28 19:46:03 +0100 |
| commit | a8ed001f36d1635bef3eb6a1bf5adcfae65dafd5 (patch) | |
| tree | 9b48b4093dde7ca0e25ca7381724f780c0aabfc1 /mkspecs/macx-ios-clang/features | |
| parent | 27d79ce91b88e550331af78a47dac16d1b11d1b0 (diff) | |
iOS: Properly detect arm64 builds when choosing which -arch flags to pass
Change-Id: Ib410584ba2c1fe342efb18eb955273090d36db8f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'mkspecs/macx-ios-clang/features')
| -rw-r--r-- | mkspecs/macx-ios-clang/features/default_post.prf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/macx-ios-clang/features/default_post.prf b/mkspecs/macx-ios-clang/features/default_post.prf index 79024c588c..2001f53ec4 100644 --- a/mkspecs/macx-ios-clang/features/default_post.prf +++ b/mkspecs/macx-ios-clang/features/default_post.prf @@ -195,8 +195,8 @@ macx-xcode { QMAKE_MAC_XCODE_SETTINGS += arch_iphoneos arch_iphonesimulator unset(QMAKE_XCODE_ARCHS) } else { -# Be more specific about which architecture we're targeting - equals(QT_ARCH, arm): \ + # Be more specific about which architecture we're targeting + contains(QT_ARCH, arm.*): \ actual_archs = $$QMAKE_IOS_DEVICE_ARCHS else: \ actual_archs = $$QMAKE_IOS_SIMULATOR_ARCHS |