diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-02-03 10:55:38 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-02-03 10:55:48 +0100 |
| commit | b1b118821be8c20a8b2935639bb925403ff9cd61 (patch) | |
| tree | fc610beb64b7868e75ab791fe20d712c6e103b60 /src/shared/clang | |
| parent | ccf57c33032e4ba644b8dfec9a470fdb3d643faa (diff) | |
| parent | 40dfb0dcf3d1dd16264d1326282e7f9c7cedde64 (diff) | |
Merge remote-tracking branch 'origin/3.6'
Change-Id: Iba662995e76f1b6ec135d64072a36a2498b2b5bb
Diffstat (limited to 'src/shared/clang')
| -rw-r--r-- | src/shared/clang/clang_installation.pri | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri index c5b8739ef3..37f16a8002 100644 --- a/src/shared/clang/clang_installation.pri +++ b/src/shared/clang/clang_installation.pri @@ -99,7 +99,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") |