diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-04-05 15:30:06 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-04-09 12:54:53 +0000 |
| commit | bb027e10a80a0c43aee74161842a726aef66fcd1 (patch) | |
| tree | b1b1144fd9d251197a4dab1d1681aa5ba2d2aa49 /src/tools/clangrefactoringbackend/clangrefactoringbackend.pro | |
| parent | 51cc3957b49b5bc305409ec012f3f97fa8db419b (diff) | |
| download | qt-creator-bb027e10a80a0c43aee74161842a726aef66fcd1.tar.gz | |
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 <marco.bubke@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/tools/clangrefactoringbackend/clangrefactoringbackend.pro')
| -rw-r--r-- | src/tools/clangrefactoringbackend/clangrefactoringbackend.pro | 4 |
1 files changed, 2 insertions, 2 deletions
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}) } |