From a8ed001f36d1635bef3eb6a1bf5adcfae65dafd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 24 Oct 2014 17:43:18 +0200 Subject: iOS: Properly detect arm64 builds when choosing which -arch flags to pass MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib410584ba2c1fe342efb18eb955273090d36db8f Reviewed-by: Oswald Buddenhagen Reviewed-by: Simon Hausmann Reviewed-by: Tor Arne Vestbø --- mkspecs/macx-ios-clang/features/default_post.prf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mkspecs/macx-ios-clang') 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 -- cgit v1.2.3