Commit c8fc52ba authored by Joerg Bornemann's avatar Joerg Bornemann Committed by Christian Kandeler
Browse files

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 7309b6a2

.

Change-Id: I71c1b8b3f9901ecc8f04106874f5697cfaa47a26
Reviewed-by: default avatarChristian Kandeler <christian.kandeler@digia.com>
parent 07d4c290
......@@ -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;
}
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment