[CMake] Fix dependencies found using LLVM's -DBUILD_SHARED_LIBS=TRUE

davezarzycki · davezarzycki · commit 6a53f67654c2 · 2019-02-15T11:28:39.000-05:00
diff --git a/lib/FrontendTool/CMakeLists.txt b/lib/FrontendTool/CMakeLists.txt
@@ -17,6 +17,7 @@ add_swift_host_library(swiftFrontendTool STATIC
     swiftClangImporter
     swiftDWARFImporter
     swiftOption
+  INTERFACE_LINK_LIBRARIES
     clangAPINotes
     clangBasic
 )
diff --git a/lib/IRGen/CMakeLists.txt b/lib/IRGen/CMakeLists.txt
@@ -57,8 +57,13 @@ add_swift_host_library(swiftIRGen STATIC
     swiftSILGen
     swiftSILOptimizer
 
+  INTERFACE_LINK_LIBRARIES
     # Clang dependencies.
     # FIXME: Clang should really export these in some reasonable manner.
     clangCodeGen
     clangAST
+
+  LLVM_COMPONENT_DEPENDS
+    target
+    transformutils
 )
diff --git a/lib/Immediate/CMakeLists.txt b/lib/Immediate/CMakeLists.txt
@@ -8,5 +8,8 @@ add_swift_host_library(swiftImmediate STATIC
     swiftSILOptimizer
     swiftIRGen
   LLVM_COMPONENT_DEPENDS
-    linker mcjit)
+    executionengine
+    linker
+    mcjit
+    transformutils)
 
diff --git a/lib/TBDGen/CMakeLists.txt b/lib/TBDGen/CMakeLists.txt
@@ -6,4 +6,6 @@ add_swift_host_library(swiftTBDGen STATIC
   LINK_LIBRARIES
     swiftAST
     swiftSIL
+  LLVM_COMPONENT_DEPENDS
+    demangle
 )
diff --git a/tools/swift-llvm-opt/CMakeLists.txt b/tools/swift-llvm-opt/CMakeLists.txt
@@ -10,4 +10,11 @@ target_link_libraries(swift-llvm-opt
                         swiftAST
                         # Clang libraries included to appease the linker on linux.
                         clangBasic
-                        clangCodeGen)
+                        clangCodeGen
+                        # LLVM libraries included to appease the linker on linux.
+                        LLVMAggressiveInstCombine
+                        LLVMCodeGen
+                        LLVMInstCombine
+                        LLVMScalarOpts
+                        LLVMVectorize
+                        )

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ add_swift_host_library(swiftFrontendTool STATIC`
`17`	`17`	`swiftClangImporter`
`18`	`18`	`swiftDWARFImporter`
`19`	`19`	`swiftOption`
	`20`	`+ INTERFACE_LINK_LIBRARIES`
`20`	`21`	`clangAPINotes`
`21`	`22`	`clangBasic`
`22`	`23`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,6 @@ add_swift_host_library(swiftTBDGen STATIC`
`6`	`6`	`LINK_LIBRARIES`
`7`	`7`	`swiftAST`
`8`	`8`	`swiftSIL`
	`9`	`+ LLVM_COMPONENT_DEPENDS`
	`10`	`+ demangle`
`9`	`11`	`)`