diff options
| author | Nikita Baryshnikov <nib952051@gmail.com> | 2016-01-31 22:44:36 +0300 |
|---|---|---|
| committer | Nikita Baryshnikov <nib952051@gmail.com> | 2016-02-02 09:28:58 +0000 |
| commit | f3ff4ba316bb47b90f1b49a916cee9407283d31b (patch) | |
| tree | c7bb25e2eece2ef606b805a6b214766cdff023f7 | |
| parent | 182bd0b34e3c10f2adc5823e84ae5062c3fc9965 (diff) | |
| download | qt-creator-f3ff4ba316bb47b90f1b49a916cee9407283d31b.tar.gz | |
Clang: fix compile error
avoid adding -L/usr/lib to linker options. To avoid linker errors with
Qt from system and from own toolchain.
Change-Id: I291943e6b17c2bf17eb0700b0fc0cda435588ad5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
| -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 6e0ced06e8..805d5d414b 100644 --- a/src/shared/clang/clang_installation.pri +++ b/src/shared/clang/clang_installation.pri @@ -93,7 +93,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") |