From 574d4ef812f9dcbb54ce659d2c6f247be773d0de Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Thu, 8 Dec 2016 13:10:04 -0800 Subject: Fix passing -arch x86_64h or -arch armv7 to Clang for Apple targets This fixes a regression `clang: error: invalid arch name '-arch armv7a'` when building for iOS armv7, which affects Qt Creator in particular. Expand the scope of the deploymentTarget autotest to verify it does not happen again. Change-Id: Ic2689ec4474f74642d3de641b57a52854d2a8bdc Reviewed-by: Christian Kandeler --- src/app/qbs-setup-toolchains/xcodeprobe.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/app/qbs-setup-toolchains/xcodeprobe.cpp') diff --git a/src/app/qbs-setup-toolchains/xcodeprobe.cpp b/src/app/qbs-setup-toolchains/xcodeprobe.cpp index 0f2ebd1b2..1e9abe73e 100644 --- a/src/app/qbs-setup-toolchains/xcodeprobe.cpp +++ b/src/app/qbs-setup-toolchains/xcodeprobe.cpp @@ -159,7 +159,7 @@ static QStringList archList(const QString &applePlatformName) } else if (applePlatformName == QStringLiteral("iphoneos") || applePlatformName == QStringLiteral("appletvos")) { if (applePlatformName != QStringLiteral("appletvos")) - archs << QStringLiteral("armv7"); + archs << QStringLiteral("armv7a"); archs << QStringLiteral("arm64"); } else if (applePlatformName == QStringLiteral("watchos")) { archs << QStringLiteral("armv7k"); -- cgit v1.2.3