From c56b308ab55af5cf8282553deafbce5ca70829b3 Mon Sep 17 00:00:00 2001 From: David Faure Date: Thu, 8 Sep 2016 16:17:55 +0200 Subject: [PATCH] Fix link error when llvm is in /usr but Qt isn't LLVM_LIBDIR=/usr was making this code insert -Wl,-rpath,/usr/lib64 into the link line, which leads to link errors due to libQt5Qml.so being picked up from there rather than from where the rest of my self-built Qt is. (Qt5Qml is an indirect dependency of the other libs on the link line) Change-Id: I76164905ede416ba2fb895fda372c08633777f4f Reviewed-by: Nikita Baryshnikov Reviewed-by: Christian Stenger Reviewed-by: Eike Ziller --- src/tools/clangbackend/clangbackend.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/clangbackend/clangbackend.pro b/src/tools/clangbackend/clangbackend.pro index c3210fedbfb..e1e08c9cb0d 100644 --- a/src/tools/clangbackend/clangbackend.pro +++ b/src/tools/clangbackend/clangbackend.pro @@ -16,5 +16,5 @@ SOURCES += clangbackendmain.cpp unix { !osx: QMAKE_LFLAGS += -Wl,-z,origin - !disable_external_rpath: QMAKE_LFLAGS += -Wl,-rpath,$$shell_quote($${LLVM_LIBDIR}) + !contains(QMAKE_DEFAULT_LIBDIRS, $${LLVM_LIBDIR}):!disable_external_rpath: QMAKE_LFLAGS += -Wl,-rpath,$$shell_quote($${LLVM_LIBDIR}) }