Re-land [lldb][NFC] Mark ValueObject library with NO_PLUGIN_DEPENDENCIES (llvm#167933)

bulbazord · web-flow · commit 3a08e423f1e7 · 2025-11-14T11:17:04.000-08:00
This is a fixed version of llvm#167886. The build previously failed with `BUILD_SHARED_LIBS=ON`. After trying that locally, I uncovered a few other instances of lldb non-plugin libraries depending on clang transitively through lldbValueObject, so I added the correct clang libraries to their dependencies.
diff --git a/lldb/source/Commands/CMakeLists.txt b/lldb/source/Commands/CMakeLists.txt
@@ -58,6 +58,9 @@ add_lldb_library(lldbCommands NO_PLUGIN_DEPENDENCIES
     lldbUtility
     lldbValueObject
     lldbVersion
+  CLANG_LIBS
+    clangFrontend
+    clangSerialization
   )
 
 add_dependencies(lldbCommands LLDBOptionsGen)
diff --git a/lldb/source/Expression/CMakeLists.txt b/lldb/source/Expression/CMakeLists.txt
@@ -24,6 +24,7 @@ add_lldb_library(lldbExpression NO_PLUGIN_DEPENDENCIES
 
   LINK_COMPONENTS
     Core
+    DebugInfoDWARF
     ExecutionEngine
     Support
   LINK_LIBS
diff --git a/lldb/source/ValueObject/CMakeLists.txt b/lldb/source/ValueObject/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_lldb_library(lldbValueObject
+add_lldb_library(lldbValueObject NO_PLUGIN_DEPENDENCIES
   DILAST.cpp
   DILEval.cpp
   DILLexer.cpp
@@ -34,6 +34,4 @@ add_lldb_library(lldbValueObject
     lldbSymbol
     lldbTarget
     lldbUtility
-    lldbPluginCPlusPlusLanguage
-    lldbPluginObjCLanguage
   )
diff --git a/lldb/source/Version/CMakeLists.txt b/lldb/source/Version/CMakeLists.txt
@@ -40,4 +40,7 @@ add_lldb_library(lldbVersion NO_PLUGIN_DEPENDENCIES
   ADDITIONAL_HEADERS
     ${version_inc}
     ${vcs_version_inc}
+
+  CLANG_LIBS
+    clangBasic
 )

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,9 @@ add_lldb_library(lldbCommands NO_PLUGIN_DEPENDENCIES`
`58`	`58`	`lldbUtility`
`59`	`59`	`lldbValueObject`
`60`	`60`	`lldbVersion`
	`61`	`+ CLANG_LIBS`
	`62`	`+ clangFrontend`
	`63`	`+ clangSerialization`
`61`	`64`	`)`
`62`	`65`
`63`	`66`	`add_dependencies(lldbCommands LLDBOptionsGen)`
Original file line number	Diff line number	Diff line change
`@@ -40,4 +40,7 @@ add_lldb_library(lldbVersion NO_PLUGIN_DEPENDENCIES`
`40`	`40`	`ADDITIONAL_HEADERS`
`41`	`41`	`${version_inc}`
`42`	`42`	`${vcs_version_inc}`
	`43`	`+`
	`44`	`+ CLANG_LIBS`
	`45`	`+ clangBasic`
`43`	`46`	`)`