From fbb0d12961d41aa2182b0cc125879f2318349d63 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 21 May 2014 16:24:29 +0200 Subject: [PATCH] qbs build: Only pass "-stdlib=libc++" to clang on Mac. This is also what the Qt mkspecs do. Otherwise we get linker errors on some installations (where libc++abi is required). Change-Id: I1f204da8825ae4dfd4650b921c8e3f32e0ad6380 Reviewed-by: Joerg Bornemann --- qbs/imports/QtcFunctions/functions.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qbs/imports/QtcFunctions/functions.js b/qbs/imports/QtcFunctions/functions.js index 97fa5190b92..75fdef55d37 100644 --- a/qbs/imports/QtcFunctions/functions.js +++ b/qbs/imports/QtcFunctions/functions.js @@ -27,7 +27,9 @@ function commonCxxFlags(qbs) { var flags = []; if (qbs.toolchain.contains("clang")) { - flags.push("-std=c++11", "-stdlib=libc++"); + flags.push("-std=c++11"); + if (qbs.targetOS.contains("darwin")) + flags.push("-stdlib=libc++"); } else if (qbs.toolchain.contains("gcc")) { flags.push("-std=c++0x"); } @@ -37,7 +39,7 @@ function commonCxxFlags(qbs) function commonLinkerFlags(qbs) { var flags = []; - if (qbs.toolchain.contains("clang")) + if (qbs.toolchain.contains("clang") && qbs.targetOS.contains("darwin")) flags.push("-stdlib=libc++"); return flags; }