diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-11 17:18:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-11 18:34:14 +0200 |
| commit | 6c2a111f8c82b56388abf409a61a3e0d56a52156 (patch) | |
| tree | 0f5a7ad320f034233c065fc994980b10afe434ad /src/core/config | |
| parent | c4fc323d0771e24ae726065cdce9eafef2c09c41 (diff) | |
| parent | d6e3ba85138a6147b9b34a1c3363b2d3b20ba284 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ib010ede9756fb02992a3276ae7ec90ef1ab56a00
Diffstat (limited to 'src/core/config')
| -rw-r--r-- | src/core/config/desktop_linux.pri | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri index a78082581..de0fbbc6b 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_widevine=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 +} |