diff options
| author | Moritz Lipp | 2020-12-18 19:58:56 +0100 |
|---|---|---|
| committer | Moritz Lipp | 2020-12-18 20:05:29 +0100 |
| commit | d59267d1c46390ba1586f3492c3007dcf82f9877 (patch) | |
| tree | e310c9c47adcb842152222626666480b1a3f0365 /arch-llvm.patch | |
| parent | af472017c6f13367937071fd8498565cda2d60fe (diff) | |
| download | aur-d59267d1c46390ba1586f3492c3007dcf82f9877.tar.gz | |
Update to 20.11
Thanks to Tymofii Khodniev
Diffstat (limited to 'arch-llvm.patch')
| -rw-r--r-- | arch-llvm.patch | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/arch-llvm.patch b/arch-llvm.patch new file mode 100644 index 000000000000..508b431c447c --- /dev/null +++ b/arch-llvm.patch @@ -0,0 +1,80 @@ +diff --git a/oclint-core/cmake/OCLintConfig.cmake b/oclint-core/cmake/OCLintConfig.cmake +index 01a3d3e..3160707 100644 +--- a/oclint-core/cmake/OCLintConfig.cmake ++++ b/oclint-core/cmake/OCLintConfig.cmake +@@ -62,19 +62,7 @@ MESSAGE(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}") + LLVM_MAP_COMPONENTS_TO_LIBNAMES(REQ_LLVM_LIBRARIES asmparser bitreader instrumentation mcparser option support frontendopenmp) + + SET(CLANG_LIBRARIES +- clangToolingCore +- clangTooling +- clangFrontend +- clangDriver +- clangSerialization +- clangParse +- clangSema +- clangAnalysis +- clangEdit +- clangASTMatchers +- clangAST +- clangLex +- clangBasic) ++ clang-cpp) + + IF(TEST_BUILD) + ENABLE_TESTING() +diff --git a/oclint-driver/CMakeLists.txt b/oclint-driver/CMakeLists.txt +index bf6578b..fe8bffc 100644 +--- a/oclint-driver/CMakeLists.txt ++++ b/oclint-driver/CMakeLists.txt +@@ -33,17 +33,17 @@ ELSE() + ) + ENDIF() + ++IF(LLVM_LINK_LLVM_DYLIB) ++ set(USE_SHARED USE_SHARED) ++ENDIF() ++ ++LLVM_CONFIG(oclint-${OCLINT_VERSION_RELEASE} ${USE_SHARED} ${REQ_LLVM_LIBRARIES}) ++ + TARGET_LINK_LIBRARIES(oclint-${OCLINT_VERSION_RELEASE} + OCLintDriver + OCLintRuleSet + OCLintCore +- clangStaticAnalyzerFrontend +- clangStaticAnalyzerCheckers +- clangStaticAnalyzerCore +- clangRewriteFrontend +- clangRewrite +- clangCrossTU +- clangIndex ++ clang-cpp + ${CLANG_LIBRARIES} + ${REQ_LLVM_LIBRARIES} + ${CMAKE_DL_LIBS} +@@ -65,11 +65,7 @@ IF(DOC_GEN_BUILD) + OCLintDriver + OCLintRuleSet + OCLintCore +- clangStaticAnalyzerFrontend +- clangStaticAnalyzerCheckers +- clangStaticAnalyzerCore +- clangRewriteFrontend +- clangRewrite ++ clang-cpp + ${CLANG_LIBRARIES} + ${REQ_LLVM_LIBRARIES} + ${CMAKE_DL_LIBS} +diff --git a/oclint-rules/rules/CMakeLists.txt b/oclint-rules/rules/CMakeLists.txt +index 2e33597..9918ab0 100644 +--- a/oclint-rules/rules/CMakeLists.txt ++++ b/oclint-rules/rules/CMakeLists.txt +@@ -19,7 +19,7 @@ MACRO(build_dynamic_rule name) + TARGET_LINK_LIBRARIES(${name}Rule OCLintAbstractRule) + + TARGET_LINK_LIBRARIES(${name}Rule +- clangASTMatchers ++ clang-cpp + ) # TODO: might be redundant + + TARGET_LINK_LIBRARIES(${name}Rule |