diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-06-25 21:41:37 -0500 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-06-26 15:26:14 +0000 |
| commit | 617f3561e8483eb5a7470c044040c4bc42c85d26 (patch) | |
| tree | 81f8d4e8c39678aecdb28ae86f60f02ff3f36a92 | |
| parent | 731eadf9bc99d65595761af743a7ebf44fa86525 (diff) | |
Assume that libc++ is present on iOS if cpp.minimumIosVersion is not set
Otherwise, tests fail to locate old c++ library on recent Macs.
Change-Id: I6ff5ceb0753dea73a5da1c70cfeb97b848cb7948
Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | share/qbs/modules/cpp/ios-gcc.qbs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/share/qbs/modules/cpp/ios-gcc.qbs b/share/qbs/modules/cpp/ios-gcc.qbs index 735766650..0ff99679f 100644 --- a/share/qbs/modules/cpp/ios-gcc.qbs +++ b/share/qbs/modules/cpp/ios-gcc.qbs @@ -50,8 +50,8 @@ DarwinGCC { : "-iphoneos_version_min" libcxxAvailable: base - && minimumDarwinVersion - && Utilities.versionCompare(minimumDarwinVersion, "5") >= 0 + && (!minimumDarwinVersion + || Utilities.versionCompare(minimumDarwinVersion, "5") >= 0) platformObjcFlags: base.concat(simulatorObjcFlags) platformObjcxxFlags: base.concat(simulatorObjcFlags) |