diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-12-08 13:10:04 -0800 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-12-09 19:21:06 +0000 |
| commit | 574d4ef812f9dcbb54ce659d2c6f247be773d0de (patch) | |
| tree | 0b95cc4b4409fba6ee8f27e2e2cdf312e7604b69 /tests/auto/blackbox/testdata/deploymentTarget/deployment.qbs | |
| parent | babbf2156579e6e0bbdac973aa5fc8c30d00b806 (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 'tests/auto/blackbox/testdata/deploymentTarget/deployment.qbs')
| -rw-r--r-- | tests/auto/blackbox/testdata/deploymentTarget/deployment.qbs | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/tests/auto/blackbox/testdata/deploymentTarget/deployment.qbs b/tests/auto/blackbox/testdata/deploymentTarget/deployment.qbs index 2abdaeaff..f805de67c 100644 --- a/tests/auto/blackbox/testdata/deploymentTarget/deployment.qbs +++ b/tests/auto/blackbox/testdata/deploymentTarget/deployment.qbs @@ -2,8 +2,15 @@ import qbs CppApplication { files: ["main.c"] - cpp.minimumMacosVersion: "10.4" - cpp.minimumIosVersion: "5.0" - cpp.cFlags: ["-v"] + + // Minimum deployment targets that: + // - will actually link (as of Xcode 8.1) + // - exist for the given architecture(s) + cpp.minimumMacosVersion: qbs.architecture === "x86_64h" ? "10.12" : "10.4" + cpp.minimumIosVersion: ["armv7s", "arm64", "x86_64"].contains(qbs.architecture) ? "7.0" : "6.0" + cpp.minimumTvosVersion: "9.0" + cpp.minimumWatchosVersion: "2.0" + + cpp.driverFlags: ["-v"] cpp.linkerFlags: ["-v"] } |