From bb027e10a80a0c43aee74161842a726aef66fcd1 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 5 Apr 2018 15:30:06 +0200 Subject: fix llvm libdir handling wrt RPATH, more or less properly we must not add the llvm libdir if it's a system path. this was already done in some places, but not in others. while we're at it, re-shuffle some pre-existing conditionals to make things consistent. Task-number: QTCREATORBUG-20178 Change-Id: Ib7e5a81705494e4cf2f83a4782ecd0832b91e511 Reviewed-by: Marco Bubke Reviewed-by: Oswald Buddenhagen --- src/tools/clangrefactoringbackend/clangrefactoringbackend.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/tools/clangrefactoringbackend/clangrefactoringbackend.pro') diff --git a/src/tools/clangrefactoringbackend/clangrefactoringbackend.pro b/src/tools/clangrefactoringbackend/clangrefactoringbackend.pro index 3b94d003c0..6e7c8262a9 100644 --- a/src/tools/clangrefactoringbackend/clangrefactoringbackend.pro +++ b/src/tools/clangrefactoringbackend/clangrefactoringbackend.pro @@ -23,7 +23,7 @@ QMAKE_CXXFLAGS += $$LLVM_CXXFLAGS SOURCES += \ clangrefactoringbackendmain.cpp -unix { +unix:!disable_external_rpath:!contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR) { !osx: QMAKE_LFLAGS += -Wl,-z,origin - !disable_external_rpath: QMAKE_LFLAGS += -Wl,-rpath,$$shell_quote($${LLVM_LIBDIR}) + QMAKE_LFLAGS += -Wl,-rpath,$$shell_quote($${LLVM_LIBDIR}) } -- cgit v1.2.1