[CMake] Fix missing linker deps when using BUILD_SHARED_LIBS

davezarzycki · davezarzycki · commit 3a7d87b4ed5e · 2020-01-23T09:40:56.000-05:00
diff --git a/lib/ClangImporter/CMakeLists.txt b/lib/ClangImporter/CMakeLists.txt
@@ -21,7 +21,8 @@ add_swift_host_library(swiftClangImporter STATIC
 )
 target_link_libraries(swiftClangImporter PRIVATE
   swiftAST
-  swiftParse)
+  swiftParse
+  LLVMBitstreamReader)
 
 # This property is only set by calls to clang_tablegen. It will not be set on
 # standalone builds, so it can always be safely passed.
diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
@@ -10,7 +10,8 @@ target_link_libraries(swift
                       PRIVATE
                         swiftDriver
                         swiftFrontendTool
-                        swiftSymbolGraphGen)
+                        swiftSymbolGraphGen
+                        LLVMBitstreamReader)
 
 swift_create_post_build_symlink(swift
   SOURCE "swift${CMAKE_EXECUTABLE_SUFFIX}"
diff --git a/unittests/ClangImporter/CMakeLists.txt b/unittests/ClangImporter/CMakeLists.txt
@@ -7,5 +7,4 @@ target_link_libraries(SwiftClangImporterTests
     swiftClangImporter
     swiftParse
     swiftAST
-    LLVMBitstreamReader
 )

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,8 @@ add_swift_host_library(swiftClangImporter STATIC`
`21`	`21`	`)`
`22`	`22`	`target_link_libraries(swiftClangImporter PRIVATE`
`23`	`23`	`swiftAST`
`24`		`- swiftParse)`
	`24`	`+ swiftParse`
	`25`	`+ LLVMBitstreamReader)`
`25`	`26`
`26`	`27`	`# This property is only set by calls to clang_tablegen. It will not be set on`
`27`	`28`	`# standalone builds, so it can always be safely passed.`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,4 @@ target_link_libraries(SwiftClangImporterTests`
`7`	`7`	`swiftClangImporter`
`8`	`8`	`swiftParse`
`9`	`9`	`swiftAST`
`10`		`- LLVMBitstreamReader`
`11`	`10`	`)`