diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-02-10 15:25:45 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-02 09:44:54 +0000 |
| commit | baa7fe0187afdc8523ceb047c648f0b1194d8fc9 (patch) | |
| tree | 9d90e911685ae880903cf9051cd5929a3b5948a9 /src/core | |
| parent | 9e65be433c1278382e1b052db0548f088e905002 (diff) | |
Fix linux-clang builds
Pass through the right GN args to make clang builds work.
Change-Id: I99d7f0caaed8a8c594a8b40f18207f2f95fe03b1
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/config/desktop_linux.pri | 1 | ||||
| -rw-r--r-- | src/core/config/embedded_linux.pri | 1 | ||||
| -rw-r--r-- | src/core/config/linux.pri | 13 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri index 10938a9f2..e6b11d290 100644 --- a/src/core/config/desktop_linux.pri +++ b/src/core/config/desktop_linux.pri @@ -2,7 +2,6 @@ include(linux.pri) use?(gn) { gn_args += \ - is_clang=false \ use_sysroot=false \ enable_session_service=false \ enable_notifications=false \ diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri index 89c9672e9..2c9338693 100644 --- a/src/core/config/embedded_linux.pri +++ b/src/core/config/embedded_linux.pri @@ -7,7 +7,6 @@ use?(gn) { is_desktop_linux=false \ use_gold=false \ use_ozone=true \ - is_clang=false \ use_sysroot=false \ enable_session_service=false \ enable_notifications=false \ diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 876ac19b9..0c15a7589 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -22,6 +22,19 @@ use?(gn) { } gcc:!clang: greaterThan(QT_GCC_MAJOR_VERSION, 5): gn_args += no_delete_null_pointer_checks=true + clang { + clang_full_path = $$which($${QMAKE_CXX}) + # Remove the "/bin/clang++" part. + clang_prefix = $$section(clang_full_path, /, 0, -3) + gn_args += \ + is_clang=true \ + clang_use_chrome_plugins=false \ + clang_base_path=\"$${clang_prefix}\" + } else { + gn_args += \ + is_clang=false + } + host_build { gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" # Don't bother trying to use system libraries in this case |