Merge pull request #20590 from compnerd/link-deps

compnerd · web-flow · commit 0741f6464cbf · 2018-11-15T11:05:26.000-08:00
tools: remove unnecessary LLVM_COMPONENT linkage
diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
@@ -7,8 +7,6 @@ add_swift_host_tool(swift
   LINK_LIBRARIES
     swiftDriver
     swiftFrontendTool
-  LLVM_COMPONENT_DEPENDS
-    DebugInfoCodeView
   SWIFT_COMPONENT compiler
 )
 
diff --git a/tools/lldb-moduleimport-test/CMakeLists.txt b/tools/lldb-moduleimport-test/CMakeLists.txt
@@ -2,8 +2,6 @@ add_swift_host_tool(lldb-moduleimport-test
   lldb-moduleimport-test.cpp
   LINK_LIBRARIES
     swiftASTSectionImporter swiftFrontend swiftClangImporter
-  LLVM_COMPONENT_DEPENDS
-    DebugInfoCodeView
   SWIFT_COMPONENT tools
 )
 
diff --git a/tools/sil-func-extractor/CMakeLists.txt b/tools/sil-func-extractor/CMakeLists.txt
@@ -6,7 +6,5 @@ add_swift_host_tool(sil-func-extractor
     swiftSILOptimizer
     swiftSerialization
     swiftClangImporter
-  LLVM_COMPONENT_DEPENDS
-    DebugInfoCodeView
   SWIFT_COMPONENT tools
 )
diff --git a/tools/sil-llvm-gen/CMakeLists.txt b/tools/sil-llvm-gen/CMakeLists.txt
@@ -8,7 +8,5 @@ add_swift_host_tool(sil-llvm-gen
     # Clang libraries included to appease the linker on linux.
     clangBasic
     clangCodeGen
-  LLVM_COMPONENT_DEPENDS
-    DebugInfoCodeView
   SWIFT_COMPONENT tools
 )
diff --git a/tools/sil-nm/CMakeLists.txt b/tools/sil-nm/CMakeLists.txt
@@ -6,7 +6,5 @@ add_swift_host_tool(sil-nm
     swiftSILOptimizer
     swiftSerialization
     swiftClangImporter
-  LLVM_COMPONENT_DEPENDS
-    DebugInfoCodeView
   SWIFT_COMPONENT tools
 )
diff --git a/tools/sil-opt/CMakeLists.txt b/tools/sil-opt/CMakeLists.txt
@@ -8,7 +8,5 @@ add_swift_host_tool(sil-opt
     # Clang libraries included to appease the linker on linux.
     clangBasic
     clangCodeGen
-  LLVM_COMPONENT_DEPENDS
-    DebugInfoCodeView
   SWIFT_COMPONENT tools
 )
diff --git a/tools/sil-passpipeline-dumper/CMakeLists.txt b/tools/sil-passpipeline-dumper/CMakeLists.txt
@@ -9,7 +9,5 @@ add_swift_host_tool(sil-passpipeline-dumper
     # FIXME: Circular dependencies require re-listing these libraries.
     swiftSema
     swiftAST
-  LLVM_COMPONENT_DEPENDS
-    DebugInfoCodeView
   SWIFT_COMPONENT tools
 )
diff --git a/tools/swift-ide-test/CMakeLists.txt b/tools/swift-ide-test/CMakeLists.txt
@@ -6,8 +6,6 @@ add_swift_host_tool(swift-ide-test
     swiftDriver
     swiftFrontend
     swiftIDE
-  LLVM_COMPONENT_DEPENDS
-    DebugInfoCodeView
   SWIFT_COMPONENT tools
 )
 
diff --git a/tools/swift-llvm-opt/CMakeLists.txt b/tools/swift-llvm-opt/CMakeLists.txt
@@ -11,8 +11,5 @@ add_swift_host_tool(swift-llvm-opt
   clangBasic
   clangCodeGen
 
-  LLVM_COMPONENT_DEPENDS
-    DebugInfoCodeView
-
   SWIFT_COMPONENT tools
 )

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@ add_swift_host_tool(swift`
`7`	`7`	`LINK_LIBRARIES`
`8`	`8`	`swiftDriver`
`9`	`9`	`swiftFrontendTool`
`10`		`- LLVM_COMPONENT_DEPENDS`
`11`		`- DebugInfoCodeView`
`12`	`10`	`SWIFT_COMPONENT compiler`
`13`	`11`	`)`
`14`	`12`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,6 @@ add_swift_host_tool(lldb-moduleimport-test`
`2`	`2`	`lldb-moduleimport-test.cpp`
`3`	`3`	`LINK_LIBRARIES`
`4`	`4`	`swiftASTSectionImporter swiftFrontend swiftClangImporter`
`5`		`- LLVM_COMPONENT_DEPENDS`
`6`		`- DebugInfoCodeView`
`7`	`5`	`SWIFT_COMPONENT tools`
`8`	`6`	`)`
`9`	`7`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,5 @@ add_swift_host_tool(sil-func-extractor`
`6`	`6`	`swiftSILOptimizer`
`7`	`7`	`swiftSerialization`
`8`	`8`	`swiftClangImporter`
`9`		`- LLVM_COMPONENT_DEPENDS`
`10`		`- DebugInfoCodeView`
`11`	`9`	`SWIFT_COMPONENT tools`
`12`	`10`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,5 @@ add_swift_host_tool(sil-llvm-gen`
`8`	`8`	`# Clang libraries included to appease the linker on linux.`
`9`	`9`	`clangBasic`
`10`	`10`	`clangCodeGen`
`11`		`- LLVM_COMPONENT_DEPENDS`
`12`		`- DebugInfoCodeView`
`13`	`11`	`SWIFT_COMPONENT tools`
`14`	`12`	`)`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,5 @@ add_swift_host_tool(sil-passpipeline-dumper`
`9`	`9`	`# FIXME: Circular dependencies require re-listing these libraries.`
`10`	`10`	`swiftSema`
`11`	`11`	`swiftAST`
`12`		`- LLVM_COMPONENT_DEPENDS`
`13`		`- DebugInfoCodeView`
`14`	`12`	`SWIFT_COMPONENT tools`
`15`	`13`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@ add_swift_host_tool(swift-ide-test`
`6`	`6`	`swiftDriver`
`7`	`7`	`swiftFrontend`
`8`	`8`	`swiftIDE`
`9`		`- LLVM_COMPONENT_DEPENDS`
`10`		`- DebugInfoCodeView`
`11`	`9`	`SWIFT_COMPONENT tools`
`12`	`10`	`)`
`13`	`11`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,5 @@ add_swift_host_tool(swift-llvm-opt`
`11`	`11`	`clangBasic`
`12`	`12`	`clangCodeGen`
`13`	`13`
`14`		`- LLVM_COMPONENT_DEPENDS`
`15`		`- DebugInfoCodeView`
`16`		`-`
`17`	`14`	`SWIFT_COMPONENT tools`
`18`	`15`	`)`