diff options
| author | Akira Hatanaka <ahatanaka@apple.com> | 2019-05-25 00:50:03 +0000 |
|---|---|---|
| committer | Akira Hatanaka <ahatanaka@apple.com> | 2019-05-25 00:50:03 +0000 |
| commit | a846427ad0ac94506661a65f9949c627011a73a4 (patch) | |
| tree | 26acf877dbd0c9480f4d4cf284b356a3bbb89ff3 | |
| parent | bab1d8edcf4b29c3529db3c6f665d2131fc917fa (diff) | |
| download | bcm5719-llvm-a846427ad0ac94506661a65f9949c627011a73a4.tar.gz bcm5719-llvm-a846427ad0ac94506661a65f9949c627011a73a4.zip | |
Revert "[Analysis] Link library dependencies to Analysis plugins"
This reverts commit r361340. The following builder has been broken for
the past few days because of this commit:
http://green.lab.llvm.org/green/job/clang-stage2-cmake-RgSan/
Also revert r361399, which was committed to fix r361340.
llvm-svn: 361685
4 files changed, 6 insertions, 13 deletions
diff --git a/clang/test/Analysis/plugins/CheckerDependencyHandling/CMakeLists.txt b/clang/test/Analysis/plugins/CheckerDependencyHandling/CMakeLists.txt index 149bccf1e0c..80e2cdbd3a2 100644 --- a/clang/test/Analysis/plugins/CheckerDependencyHandling/CMakeLists.txt +++ b/clang/test/Analysis/plugins/CheckerDependencyHandling/CMakeLists.txt @@ -1,12 +1,11 @@ set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/CheckerDependencyHandlingAnalyzerPlugin.exports) add_llvm_library(CheckerDependencyHandlingAnalyzerPlugin MODULE CheckerDependencyHandling.cpp PLUGIN_TOOL clang) -if(LLVM_ENABLE_PLUGINS) +if(LLVM_ENABLE_PLUGINS AND (WIN32 OR CYGWIN)) target_link_libraries(CheckerDependencyHandlingAnalyzerPlugin PRIVATE clangAnalysis clangAST clangStaticAnalyzerCore - clangStaticAnalyzerFrontend LLVMSupport ) endif() diff --git a/clang/test/Analysis/plugins/CheckerOptionHandling/CMakeLists.txt b/clang/test/Analysis/plugins/CheckerOptionHandling/CMakeLists.txt index 2d6a2095091..6a1d5e85279 100644 --- a/clang/test/Analysis/plugins/CheckerOptionHandling/CMakeLists.txt +++ b/clang/test/Analysis/plugins/CheckerOptionHandling/CMakeLists.txt @@ -1,12 +1,11 @@ set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/CheckerOptionHandlingAnalyzerPlugin.exports) add_llvm_library(CheckerOptionHandlingAnalyzerPlugin MODULE CheckerOptionHandling.cpp PLUGIN_TOOL clang) -if(LLVM_ENABLE_PLUGINS) +if(LLVM_ENABLE_PLUGINS AND (WIN32 OR CYGWIN)) target_link_libraries(CheckerOptionHandlingAnalyzerPlugin PRIVATE clangAnalysis clangAST clangStaticAnalyzerCore - clangStaticAnalyzerFrontend LLVMSupport ) endif() diff --git a/clang/test/Analysis/plugins/SampleAnalyzer/CMakeLists.txt b/clang/test/Analysis/plugins/SampleAnalyzer/CMakeLists.txt index d0a935c1676..7c7b2aec198 100644 --- a/clang/test/Analysis/plugins/SampleAnalyzer/CMakeLists.txt +++ b/clang/test/Analysis/plugins/SampleAnalyzer/CMakeLists.txt @@ -1,12 +1,11 @@ set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/SampleAnalyzerPlugin.exports) add_llvm_library(SampleAnalyzerPlugin MODULE MainCallChecker.cpp PLUGIN_TOOL clang) -if(LLVM_ENABLE_PLUGINS) +if(LLVM_ENABLE_PLUGINS AND (WIN32 OR CYGWIN)) target_link_libraries(SampleAnalyzerPlugin PRIVATE clangAnalysis clangAST clangStaticAnalyzerCore - clangStaticAnalyzerFrontend LLVMSupport ) endif() diff --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake index f172092508a..cb9a01e1d39 100644 --- a/llvm/cmake/modules/HandleLLVMOptions.cmake +++ b/llvm/cmake/modules/HandleLLVMOptions.cmake @@ -914,14 +914,10 @@ endif() # Plugin support # FIXME: Make this configurable. -if(WIN32 OR CYGWIN) - if(BUILD_SHARED_LIBS OR LLVM_BUILD_LLVM_DYLIB) - set(LLVM_ENABLE_PLUGINS ON) - else() - set(LLVM_ENABLE_PLUGINS OFF) - endif() +if(BUILD_SHARED_LIBS OR LLVM_BUILD_LLVM_DYLIB) + set(LLVM_ENABLE_PLUGINS ON) else() - set(LLVM_ENABLE_PLUGINS ${LLVM_ENABLE_PIC}) + set(LLVM_ENABLE_PLUGINS OFF) endif() # By default we should enable LLVM_ENABLE_IDE only for multi-configuration |
