From 21a40af00a85fad03201131426087ec90745b9aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= Date: Tue, 13 Sep 2016 15:47:37 +0000 Subject: Pass correct clang prefix directory to GYP Previously the prefix was hardcoded to "/usr". Now the current environment clang path is considered instead. Change-Id: I23173bb31591dfb6df7a81a37a58502dd6b12886 Task-number: QTBUG-52656 Reviewed-by: Allan Sandfeld Jensen --- src/core/config/desktop_linux.pri | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri index a72452b90..e28d7eb7c 100644 --- a/src/core/config/desktop_linux.pri +++ b/src/core/config/desktop_linux.pri @@ -9,7 +9,10 @@ GYP_CONFIG += \ clang { GYP_CONFIG += werror= - GYP_CONFIG += clang=1 host_clang=1 clang_use_chrome_plugins=0 make_clang_dir=/usr + clang_full_path = $$which($${QMAKE_CXX}) + # Remove the "/bin/clang++" part. + clang_prefix = $$section(clang_full_path, /, 0, -3) + GYP_CONFIG += clang=1 host_clang=1 clang_use_chrome_plugins=0 make_clang_dir=$${clang_prefix} linux-clang-libc++: GYP_CONFIG += use_system_libcxx=1 } else { GYP_CONFIG += clang=0 host_clang=0 -- cgit v1.2.3