diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2014-08-18 20:41:35 -0400 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-08-21 12:45:44 +0200 |
| commit | 9962145a544f56f62941fe329241bac1a496e8b7 (patch) | |
| tree | e32e50542a68cf93395130a0ce53b389ca973cb0 /share/qbs/modules/cpp/ios-gcc.qbs | |
| parent | 202e783bc5a855517a72f0c3f931e6388c735711 (diff) | |
Set better defaults for cpp.minimumOsxVersion and cpp.minimumIosVersion.
Now, each platform doesn't get both properties set, and the default is
usually the version of the SDK in use. This is both consistent with
Xcode's behavior and necessary to convince the tools that the target is
iOS Simulator and not OS X, as appropriate.
Change-Id: I63037138d38675c5f0cc53e721e42a4d7cc2c3b7
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'share/qbs/modules/cpp/ios-gcc.qbs')
| -rw-r--r-- | share/qbs/modules/cpp/ios-gcc.qbs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/share/qbs/modules/cpp/ios-gcc.qbs b/share/qbs/modules/cpp/ios-gcc.qbs index 1c38c0052..fa743c2f8 100644 --- a/share/qbs/modules/cpp/ios-gcc.qbs +++ b/share/qbs/modules/cpp/ios-gcc.qbs @@ -7,6 +7,9 @@ import qbs.ModUtils DarwinGCC { condition: qbs.hostOS.contains('osx') && qbs.targetOS.contains('ios') && qbs.toolchain.contains('gcc') + // Setting a minimum is especially important for Simulator or CC/LD thinks the target is OS X + minimumIosVersion: xcodeSdkVersion || (cxxStandardLibrary === "libc++" ? "5.0" : undefined) + Rule { condition: !product.moduleProperty("qbs", "targetOS").contains("ios-simulator") multiplex: true |