diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-13 10:16:32 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-14 10:43:10 +0200 |
| commit | 939d104cc5a8208a0bef94ca14889ccd584a3526 (patch) | |
| tree | 4d89c122ad5014a32cd8d4fbad6b7418944d2fb6 /src/core/config | |
| parent | 5a7063154520544fe19bb57af3609afef898bffb (diff) | |
| parent | 6c2a111f8c82b56388abf409a61a3e0d56a52156 (diff) | |
Merge branch '5.7' into dev
Change-Id: I1ecb615b8df1303c27b6609970502920123b3610
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 +} |