feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ClangCodeModel: fix link error with MinGW based build

Browse Source 
For MinGW clang link library named: liblibclang.dll.a.

Changes:
- improved clang library search algorithm;
- use clang_defines.pri in clangpchmanager.pro.

Task-number: QTCREATORBUG-17680
Change-Id: Ic01fa86238b980991726eeb984ccd82afb333c35
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Konstantin Podsvirov
2017-02-04 01:46:35 +03:00
parent 195c7711cb
commit 2257b03212
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/clangpchmanager/clangpchmanager.pro
View File

@@ -1,9 +1,7 @@
include(../../qtcreatorplugin.pri) include(../../qtcreatorplugin.pri)
include(clangpchmanager-source.pri) include(clangpchmanager-source.pri)
include(../../shared/clang/clang_installation.pri) include(../../shared/clang/clang_installation.pri)
include(../../shared/clang/clang_defines.pri)
DEFINES += CLANG_VERSION=\\\"$${LLVM_VERSION}\\\"
DEFINES += "\"CLANG_RESOURCE_DIR=\\\"$${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include\\\"\""
HEADERS += \ HEADERS += \
$$PWD/clangpchmanagerplugin.h \ $$PWD/clangpchmanagerplugin.h \

11
src/shared/clang/clang_installation.pri
View File

@@ -45,6 +45,10 @@ defineReplace(findClangLibInLibDir) {
} else { } else {
exists ($${libdir}/libclang.*) { exists ($${libdir}/libclang.*) {
return("-llibclang") return("-llibclang")
} else {
exists ($${libdir}/liblibclang.dll.a) {
return("-llibclang.dll")
}
} }
} }
} }
@@ -78,8 +82,11 @@ LLVM_LIBDIR = $$quote($$system($$llvm_config --libdir, lines))
LLVM_INCLUDEPATH = $$system($$llvm_config --includedir, lines) LLVM_INCLUDEPATH = $$system($$llvm_config --includedir, lines)
output = $$system($$llvm_config --version, lines) output = $$system($$llvm_config --version, lines)
LLVM_VERSION = $$extractVersion($$output) LLVM_VERSION = $$extractVersion($$output)
unix:LLVM_STATIC_LIBS_STRING += $$system($$llvm_config --libs, lines) msvc {
win32:LLVM_STATIC_LIBS_STRING += $$system($$llvm_config --libnames, lines) LLVM_STATIC_LIBS_STRING += $$system($$llvm_config --libnames, lines)
} else {
LLVM_STATIC_LIBS_STRING += $$system($$llvm_config --libs, lines)
}
LLVM_STATIC_LIBS_STRING += $$system($$llvm_config --system-libs, lines) LLVM_STATIC_LIBS_STRING += $$system($$llvm_config --system-libs, lines)
LLVM_STATIC_LIBS = $$split(LLVM_STATIC_LIBS_STRING, " ") LLVM_STATIC_LIBS = $$split(LLVM_STATIC_LIBS_STRING, " ")