Avoid building analyzer plugins if CLANG_ENABLE_STATIC_ANALYZER is OFF

[dim]

Summary

Attempting to build clang with CLANG_ENABLE_STATIC_ANALYZER=OFF fails
after rC362328, because the new plugins under lib/Analysis/plugins are
dependent on the static analyzer libraries.

Add checks to disable building these if CLANG_ENABLE_STATIC_ANALYZER is
OFF.

[kristina]

Experienced the same, updated my test build configuration to always force CLANG_ENABLE_STATIC_ANALYZER to On when building with tests. Maybe it's worth adding a warning about when Clang tests are being built?

[nathanchance]

Thanks for the quick fix, looks good to me!

[hintonda]

In D62873#1529800, @nathanchance wrote:

Thanks for the quick fix, looks good to me!

Ah, sorry, just saw this. I just committed r362555 that addresses this.

[hintonda]

LGTM...

test/CMakeLists.txt

122

I didn't fix this one, but makes sense.

[Szelethus]

lib/Analysis/plugins/CMakeLists.txt

1

Is this file a thing? lib/Analysis/plugins/CMakeLists.txt? I can't seem to find it anywhere.

[hintonda]

lib/Analysis/plugins/CMakeLists.txt

1

commit a33eaad00cca99ca0b5d2b0cc6dec33be6d7ee7f (origin/master, origin/HEAD, master)
Author: Don Hinton <[e-mail]>
Date: Tue Jun 4 22:07:40 2019 +0000

[Analysis] Only build Analysis plugins when CLANG_ENABLE_STATIC_ANALYZER is enabled.

Fixes bug introduced in r362328.

Thanks to Nathan Chancellor for reporting this!

llvm-svn: 362555

$ git diff 06c801e153347d24ec7ce93f6ffbbc58b64a89ba a33eaad00cca99ca0b5d2b0cc6dec33be6d7ee7f
diff --git a/clang/lib/Analysis/plugins/CMakeLists.txt b/clang/lib/Analysis/plugins/CMakeLists.txt
index f7dbc936952..bd7314a871f 100644

• a/clang/lib/Analysis/plugins/CMakeLists.txt

+++ b/clang/lib/Analysis/plugins/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(LLVM_ENABLE_PLUGINS)
+if(CLANG_ENABLE_STATIC_ANALYZER AND LLVM_ENABLE_PLUGINS)

add_subdirectory(SampleAnalyzer)
add_subdirectory(CheckerDependencyHandling)
add_subdirectory(CheckerOptionHandling)

[Szelethus]

I seem to have missed out on previous commits that moved analyzer plugins around -- would you mind adding [analyzer] to the revision names that affect the Static Analyzer? Many of us are automatically subscribed to such patches.

In any case, LGTM!

lib/Analysis/plugins/CMakeLists.txt

1

Oops, my apologies, was on the wrong branch.

[hintonda]

In D62873#1530197, @Szelethus wrote:

I seem to have missed out on previous commits that moved analyzer plugins around -- would you mind adding [analyzer] to the revision names that affect the Static Analyzer? Many of us are automatically subscribed to such patches.

In any case, LGTM!

Sorry about that. I was mainly trying to fix broken llvm plugins that were no longer available with the previous changes to LLVM_ENABLE_PLUGIN.

[dim]

No longer needed after rC362328 and follow-ups.

lib/Analysis/plugins/CMakeLists.txt

-if(LLVM_ENABLE_PLUGINS)
+if(LLVM_ENABLE_PLUGINS AND CLANG_ENABLE_STATIC_ANALYZER)
   add_subdirectory(SampleAnalyzer)
   add_subdirectory(CheckerDependencyHandling)
   add_subdirectory(CheckerOptionHandling)
 endif()

test/CMakeLists.txt

list(APPEND CLANG_TEST_DEPS
     opt
     )
 
   if(TARGET llvm-lto)
     list(APPEND CLANG_TEST_DEPS llvm-lto)
   endif()
 endif()
 
-if (CLANG_ENABLE_STATIC_ANALYZER)
-  if (LLVM_ENABLE_PLUGINS)
-    list(APPEND CLANG_TEST_DEPS
-      SampleAnalyzerPlugin
-      CheckerDependencyHandlingAnalyzerPlugin
-      CheckerOptionHandlingAnalyzerPlugin
-      )
-  endif()
-endif()
+if(LLVM_ENABLE_PLUGINS AND CLANG_ENABLE_STATIC_ANALYZER)
 
 add_custom_target(clang-test-depends DEPENDS ${CLANG_TEST_DEPS})
 set_target_properties(clang-test-depends PROPERTIES FOLDER "Clang tests")
 
 add_lit_testsuite(check-clang "Running the Clang regression tests"
   ${CMAKE_CURRENT_BINARY_DIR}
   #LIT ${LLVM_LIT}
   PARAMS ${CLANG_TEST_PARAMS}