From 617f3561e8483eb5a7470c044040c4bc42c85d26 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Tue, 25 Jun 2019 21:41:37 -0500 Subject: 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 Reviewed-by: Christian Kandeler --- share/qbs/modules/cpp/ios-gcc.qbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'share/qbs/modules/cpp/ios-gcc.qbs') 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) -- cgit v1.2.1