D67877

Origin: https://reviews.llvm.org/D67877
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=941082

Gbp-Pq: Name D67877.patch

diff --git a/clang/lib/Analysis/plugins/CMakeLists.txt b/clang/lib/Analysis/plugins/CMakeLists.txt
index bd7314a871fc50e57dedcb6ce7dc20b24c254bf8..ad54e6537e960216e5979fd8891a8239784a4ccd 100644 (file)
--- a/clang/lib/Analysis/plugins/CMakeLists.txt
+++ b/clang/lib/Analysis/plugins/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(CLANG_ENABLE_STATIC_ANALYZER AND LLVM_ENABLE_PLUGINS)
+if(CLANG_ENABLE_STATIC_ANALYZER AND LLVM_ENABLE_PLUGINS AND CLANG_BUILD_EXAMPLES)
   add_subdirectory(SampleAnalyzer)
   add_subdirectory(CheckerDependencyHandling)
   add_subdirectory(CheckerOptionHandling)

diff --git a/clang/test/CMakeLists.txt b/clang/test/CMakeLists.txt
index 7fdc7d0be79f334b4328597f00c8ea797d5a40ee..0f18700bb2f08b4c29ce507404ec3f45e37b76ad 100644 (file)
--- a/clang/test/CMakeLists.txt
+++ b/clang/test/CMakeLists.txt
@@ -127,14 +127,12 @@ if( NOT CLANG_BUILT_STANDALONE )
   endif()
 endif()
 
-if (CLANG_ENABLE_STATIC_ANALYZER)
-  if (LLVM_ENABLE_PLUGINS)
-    list(APPEND CLANG_TEST_DEPS
-      SampleAnalyzerPlugin
-      CheckerDependencyHandlingAnalyzerPlugin
-      CheckerOptionHandlingAnalyzerPlugin
-      )
-  endif()
+if (CLANG_ENABLE_STATIC_ANALYZER AND CLANG_BUILD_EXAMPLES AND LLVM_ENABLE_PLUGINS)
+  list(APPEND CLANG_TEST_DEPS
+    SampleAnalyzerPlugin
+    CheckerDependencyHandlingAnalyzerPlugin
+    CheckerOptionHandlingAnalyzerPlugin
+    )
 endif()
 
 # Copy gen_ast_dump_json_test.py to the clang build dir. This allows invoking