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 /tests | |
| parent | 51cc3957b49b5bc305409ec012f3f97fa8db419b (diff) | |
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 'tests')
| -rw-r--r-- | tests/unit/unittest/clang_dependency.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/unit/unittest/clang_dependency.pri b/tests/unit/unittest/clang_dependency.pri index 9c2a3c57a3..e0c3b1a948 100644 --- a/tests/unit/unittest/clang_dependency.pri +++ b/tests/unit/unittest/clang_dependency.pri @@ -17,7 +17,7 @@ include(../../../src/shared/clang/clang_installation.pri) } LIBS += $$LIBTOOLING_LIBS $$LIBCLANG_LIBS - QMAKE_RPATHDIR += $$LLVM_LIBDIR + !contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR): QMAKE_RPATHDIR += $$LLVM_LIBDIR LLVM_CXXFLAGS ~= s,-g\d?, QMAKE_CXXFLAGS += $$LLVM_CXXFLAGS |