aboutsummaryrefslogtreecommitdiffstats
path: root/src/app/qbs-setup-toolchains/xcodeprobe.cpp
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2016-12-08 13:10:04 -0800
committerJake Petroules <jake.petroules@qt.io>2016-12-09 19:21:06 +0000
commit574d4ef812f9dcbb54ce659d2c6f247be773d0de (patch)
tree0b95cc4b4409fba6ee8f27e2e2cdf312e7604b69 /src/app/qbs-setup-toolchains/xcodeprobe.cpp
parentbabbf2156579e6e0bbdac973aa5fc8c30d00b806 (diff)
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 <christian.kandeler@qt.io>
Diffstat (limited to 'src/app/qbs-setup-toolchains/xcodeprobe.cpp')
-rw-r--r--src/app/qbs-setup-toolchains/xcodeprobe.cpp2
1 files changed, 1 insertions, 1 deletions
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");