Fix handling of cpp.cxxStandardLibrary.

This fixes a bug where -stdlib=libc++ would be added unconditionally,
and makes sure not to add -stdlib=undefined to the CLI invocation.

Also, the Qt.core template has been adapted to use the new property.

Change-Id: I1dd12097edd992d851c52287e86572d6ef21bfac
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

1 files changed, 6 insertions, 9 deletions

diff --git a/src/lib/qtprofilesetup/templates/core.qbs b/src/lib/qtprofilesetup/templates/core.qbs
index 0d1e12c49..e88eb121a 100644
--- a/src/lib/qtprofilesetup/templates/core.qbs
+++ b/src/lib/qtprofilesetup/templates/core.qbs
@@ -105,13 +105,7 @@ Module {
         libs = libs.concat(dynamicLibs);
         return libs;
     }
-    cpp.linkerFlags: {
-        var flags = coreLinkerFlags;
-        if (qbs.targetOS.contains('darwin') && qbs.toolchain.contains('clang')
-                && config.contains('c++11'))
-            flags.push('-stdlib=libc++');
-        return flags;
-    }
+    cpp.linkerFlags: coreLinkerFlags
     cpp.frameworkPaths: coreFrameworkPaths.concat(frameworkBuild ? [libPath] : [])
     cpp.frameworks: {
         var frameworks = coreFrameworks
@@ -132,10 +126,13 @@ Module {
             if (versionMajor < 5)
                 flags.push('/Zc:wchar_t-');
         }
+
+        return flags;
+    }
+    cpp.cxxStandardLibrary: {
         if (qbs.targetOS.contains('darwin') && qbs.toolchain.contains('clang')
                 && config.contains('c++11'))
-            flags.push('-stdlib=libc++');
-        return flags;
+            return "libc++";
     }
 
     additionalProductTypes: ["qm"]