diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-05-07 15:46:41 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-05-07 17:02:25 +0200 |
| commit | c8fc52bad6f4cb994c12222df86b07dc19628df0 (patch) | |
| tree | 580a6630335f78457be296617411884c0ea51c6a /qbs | |
| parent | 07d4c290439282b83c84c5ebd7dcd0f108290ed3 (diff) | |
fix qbs clang build
The clang flags for C++11 were incomplete.
The linker flag -lc++abi isn't needed.
On OS X the minimum OS version must be set to 10.7.
This amends 7309b6a2d9a30cc6be7087c12aec2ada65de7b36.
Change-Id: I71c1b8b3f9901ecc8f04106874f5697cfaa47a26
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/imports/QtcFunctions/functions.js | 9 | ||||
| -rw-r--r-- | qbs/imports/QtcLibrary.qbs | 1 | ||||
| -rw-r--r-- | qbs/imports/QtcPlugin.qbs | 1 | ||||
| -rw-r--r-- | qbs/imports/QtcTool.qbs | 1 |
4 files changed, 8 insertions, 4 deletions
diff --git a/qbs/imports/QtcFunctions/functions.js b/qbs/imports/QtcFunctions/functions.js index 136f757767..97fa5190b9 100644 --- a/qbs/imports/QtcFunctions/functions.js +++ b/qbs/imports/QtcFunctions/functions.js @@ -26,10 +26,11 @@ function versionIsAtLeast(actualVersion, expectedVersion) function commonCxxFlags(qbs) { var flags = []; - if (qbs.toolchain.contains("clang")) - flags.push("-std=c++11"); - else if (qbs.toolchain.contains("gcc")) + if (qbs.toolchain.contains("clang")) { + flags.push("-std=c++11", "-stdlib=libc++"); + } else if (qbs.toolchain.contains("gcc")) { flags.push("-std=c++0x"); + } return flags; } @@ -37,7 +38,7 @@ function commonLinkerFlags(qbs) { var flags = []; if (qbs.toolchain.contains("clang")) - flags.push("-stdlib=libc++", "-lc++abi"); + flags.push("-stdlib=libc++"); return flags; } diff --git a/qbs/imports/QtcLibrary.qbs b/qbs/imports/QtcLibrary.qbs index ec10919caa..55d5490384 100644 --- a/qbs/imports/QtcLibrary.qbs +++ b/qbs/imports/QtcLibrary.qbs @@ -27,6 +27,7 @@ DynamicLibrary { : ["$ORIGIN", "$ORIGIN/.."] property string libIncludeBase: ".." // #include <lib/header.h> cpp.includePaths: [libIncludeBase] + cpp.minimumOsxVersion: "10.7" cpp.minimumWindowsVersion: qbs.architecture === "x86" ? "5.1" : "5.2" Export { diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs index 3fb2b2c2ec..638891e501 100644 --- a/qbs/imports/QtcPlugin.qbs +++ b/qbs/imports/QtcPlugin.qbs @@ -39,6 +39,7 @@ Product { property string pluginIncludeBase: ".." // #include <plugin/header.h> cpp.includePaths: [pluginIncludeBase] + cpp.minimumOsxVersion: "10.7" cpp.minimumWindowsVersion: qbs.architecture === "x86" ? "5.1" : "5.2" Group { diff --git a/qbs/imports/QtcTool.qbs b/qbs/imports/QtcTool.qbs index 0c1433df8d..34d5bf45a5 100644 --- a/qbs/imports/QtcTool.qbs +++ b/qbs/imports/QtcTool.qbs @@ -18,6 +18,7 @@ Application { cpp.rpaths: qbs.targetOS.contains("osx") ? ["@executable_path/../" + project.ide_library_path] : ["$ORIGIN/../" + project.ide_library_path] + cpp.minimumOsxVersion: "10.7" cpp.minimumWindowsVersion: qbs.architecture === "x86" ? "5.1" : "5.2" Group { |