From f3ff4ba316bb47b90f1b49a916cee9407283d31b Mon Sep 17 00:00:00 2001 From: Nikita Baryshnikov Date: Sun, 31 Jan 2016 22:44:36 +0300 Subject: Clang: fix compile error avoid adding -L/usr/lib to linker options. To avoid linker errors with Qt from system and from own toolchain. Change-Id: I291943e6b17c2bf17eb0700b0fc0cda435588ad5 Reviewed-by: Oswald Buddenhagen Reviewed-by: Eike Ziller Reviewed-by: Nikolai Kosjar --- src/shared/clang/clang_installation.pri | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/shared/clang') diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri index 6e0ced06e84..805d5d414bb 100644 --- a/src/shared/clang/clang_installation.pri +++ b/src/shared/clang/clang_installation.pri @@ -93,7 +93,8 @@ unix { clang_lib = $$findClangLibInLibDir($$LLVM_LIBDIR) isEmpty(clang_lib): error("Cannot find Clang shared library in $$LLVM_LIBDIR") - LLVM_LIBS = -L$${LLVM_LIBDIR} -l$${clang_lib} + !contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR): LLVM_LIBS = -L$${LLVM_LIBDIR} + LLVM_LIBS += -l$${clang_lib} } isEmpty(LLVM_VERSION): error("Cannot determine clang version at $$LLVM_INSTALL_DIR") -- cgit v1.2.3