summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@theqtcompany.com>2016-03-30 18:59:04 +0200
committerAlexandru Croitor <alexandru.croitor@theqtcompany.com>2016-06-08 06:58:58 +0000
commit59d9bf5902f32a41923b8b585c222efab3d6aa50 (patch)
tree84516bfac5b12b4a2805103c6d4f235009028c3a /src
parentbfcbdc3ab42880dc37ffa7174af96928ccf25f03 (diff)
Make sure linux-clang-libc++ mkspec uses clang build parameters.
And also uses the system provided libc++ library. Task-number: QTBUG-53685 Change-Id: Ibc6a773cf65ca057770baecedcff6ab27ffabf66 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/core/config/desktop_linux.pri8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri
index f0bf6cb23..ff3cc9170 100644
--- a/src/core/config/desktop_linux.pri
+++ b/src/core/config/desktop_linux.pri
@@ -6,5 +6,9 @@ GYP_CONFIG += \
desktop_linux=1 \
enable_plugins=1 \
-linux-clang: GYP_CONFIG += clang=1 host_clang=1 clang_use_chrome_plugins=0 make_clang_dir=/usr
-else: GYP_CONFIG += clang=0 host_clang=0
+clang {
+ GYP_CONFIG += clang=1 host_clang=1 clang_use_chrome_plugins=0 make_clang_dir=/usr
+ linux-clang-libc++: GYP_CONFIG += use_system_libcxx=1
+} else {
+ GYP_CONFIG += clang=0 host_clang=0
+}