Rebase clang patch
This commit is contained in:
Jan Grulich
parent
999edf6ab5
commit
7095c5d4f7
|
|
@ -1,80 +1,74 @@
|
||||||
From 3dfe3b966f3fb069f258991b6a468816aab13908 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tom Stellard <tstellar@redhat.com>
|
|
||||||
Date: Thu, 12 Dec 2019 22:47:04 +0000
|
|
||||||
Subject: [PATCH] Link against libclang-cpp.so instead of the clang component
|
|
||||||
libraries
|
|
||||||
|
|
||||||
---
|
|
||||||
src/qdoc/configure.pri | 56 +-----------------------------------------
|
|
||||||
1 file changed, 1 insertion(+), 55 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/qdoc/configure.pri b/src/qdoc/configure.pri
|
diff --git a/src/qdoc/configure.pri b/src/qdoc/configure.pri
|
||||||
index e9d7667c..65470129 100644
|
index 4f3d776..bcd2aae 100644
|
||||||
--- a/src/qdoc/configure.pri
|
--- a/src/qdoc/configure.pri
|
||||||
+++ b/src/qdoc/configure.pri
|
+++ b/src/qdoc/configure.pri
|
||||||
@@ -142,61 +142,7 @@ defineTest(qtConfTest_libclang) {
|
@@ -146,33 +146,6 @@ defineTest(qtConfTest_libclang) {
|
||||||
CLANG_LIBS += -llibclang_static -ladvapi32 -lshell32 -lMincore
|
}
|
||||||
} else {
|
}
|
||||||
!equals(QMAKE_HOST.os, Darwin): CLANG_LIBS+=-Wl,--start-group
|
!equals(QMAKE_HOST.os, Darwin):!msvc: CLANG_LIBS+=-Wl,--start-group
|
||||||
- CLANG_LIBS += -lclangAnalysis \
|
- CLANG_LIBS += -lclangAnalysis \
|
||||||
- -lclangApplyReplacements \
|
- -lclangARCMigrate \
|
||||||
- -lclangARCMigrate \
|
- -lclangAST \
|
||||||
- -lclangAST \
|
- -lclangASTMatchers \
|
||||||
- -lclangASTMatchers \
|
- -lclangBasic \
|
||||||
- -lclangBasic \
|
- -lclangCodeGen \
|
||||||
- -lclangChangeNamespace \
|
- -lclangCrossTU \
|
||||||
- -lclangCodeGen \
|
- -lclangDriver \
|
||||||
- -lclangCrossTU \
|
- -lclangDynamicASTMatchers \
|
||||||
- -lclangDaemon \
|
- -lclangEdit \
|
||||||
- -lclangDriver \
|
- -lclangFormat \
|
||||||
- -lclangDynamicASTMatchers \
|
- -lclangFrontend \
|
||||||
- -lclangEdit \
|
- -lclangFrontendTool \
|
||||||
- -lclangFormat \
|
- -lclangHandleCXX \
|
||||||
- -lclangFrontend \
|
- -lclangIndex \
|
||||||
- -lclangFrontendTool \
|
- -lclangLex \
|
||||||
- -lclangHandleCXX \
|
- -lclangParse \
|
||||||
- -lclangIncludeFixer \
|
- -lclangRewrite \
|
||||||
- -lclangIncludeFixerPlugin \
|
- -lclangRewriteFrontend \
|
||||||
- -lclangIndex \
|
- -lclangSema \
|
||||||
- -lclangLex \
|
- -lclangSerialization \
|
||||||
- -lclangMove \
|
- -lclangStaticAnalyzerCheckers \
|
||||||
- -lclangParse \
|
- -lclangStaticAnalyzerCore \
|
||||||
- -lclangQuery \
|
- -lclangStaticAnalyzerFrontend \
|
||||||
- -lclangReorderFields \
|
- -lclangTooling \
|
||||||
- -lclangRewrite \
|
- -lclangToolingASTDiff \
|
||||||
- -lclangRewriteFrontend \
|
- -lclangToolingCore
|
||||||
- -lclangSema \
|
|
||||||
- -lclangSerialization \
|
versionIsAtLeast($$CLANG_VERSION, "10.0.0") {
|
||||||
- -lclang_static \
|
equals(QMAKE_HOST.os, Windows): \
|
||||||
- -lclangStaticAnalyzerCheckers \
|
@@ -187,34 +160,7 @@ defineTest(qtConfTest_libclang) {
|
||||||
- -lclangStaticAnalyzerCore \
|
else: \
|
||||||
- -lclangStaticAnalyzerFrontend \
|
CLANG_LIBS += -lclang_static
|
||||||
- -lclangTidy \
|
|
||||||
- -lclangTidyAndroidModule \
|
- CLANG_LIBS += \
|
||||||
- -lclangTidyBoostModule \
|
- -lclangApplyReplacements \
|
||||||
- -lclangTidyBugproneModule \
|
- -lclangChangeNamespace \
|
||||||
- -lclangTidyCERTModule \
|
- -lclangDaemon \
|
||||||
- -lclangTidyCppCoreGuidelinesModule \
|
- -lclangIncludeFixer \
|
||||||
- -lclangTidyFuchsiaModule \
|
- -lclangIncludeFixerPlugin \
|
||||||
- -lclangTidyGoogleModule \
|
- -lclangMove \
|
||||||
- -lclangTidyHICPPModule \
|
- -lclangQuery \
|
||||||
- -lclangTidyLLVMModule \
|
- -lclangReorderFields \
|
||||||
- -lclangTidyMiscModule \
|
- -lclangTidy \
|
||||||
- -lclangTidyModernizeModule \
|
- -lclangTidyAndroidModule \
|
||||||
- -lclangTidyMPIModule \
|
- -lclangTidyBoostModule \
|
||||||
- -lclangTidyObjCModule \
|
- -lclangTidyBugproneModule \
|
||||||
- -lclangTidyPerformanceModule \
|
- -lclangTidyCERTModule \
|
||||||
- -lclangTidyPlugin \
|
- -lclangTidyCppCoreGuidelinesModule \
|
||||||
- -lclangTidyReadabilityModule \
|
- -lclangTidyFuchsiaModule \
|
||||||
- -lclangTidyUtils \
|
- -lclangTidyGoogleModule \
|
||||||
- -lclangTooling \
|
- -lclangTidyHICPPModule \
|
||||||
- -lclangToolingASTDiff \
|
- -lclangTidyLLVMModule \
|
||||||
- -lclangToolingCore \
|
- -lclangTidyMiscModule \
|
||||||
- -lclangToolingRefactor \
|
- -lclangTidyModernizeModule \
|
||||||
+ CLANG_LIBS += -lclang-cpp \
|
- -lclangTidyMPIModule \
|
||||||
-lfindAllSymbols \
|
- -lclangTidyObjCModule \
|
||||||
-lLLVMAArch64AsmParser \
|
- -lclangTidyPerformanceModule \
|
||||||
-lLLVMAArch64AsmPrinter \
|
- -lclangTidyPlugin \
|
||||||
--
|
- -lclangTidyReadabilityModule \
|
||||||
2.20.1
|
- -lclangTidyUtils \
|
||||||
|
- -lclangToolingRefactor \
|
||||||
|
+ CLANG_LIBS += -lclang-cpp \
|
||||||
|
-lfindAllSymbols
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue