[upstream-update] Link LLVMDebugInfoCodeView into 6 executable tools. (#4489)

compnerd · gottesmm · commit 2d50ed9ca3d7 · 2016-08-26T02:20:45.000-04:00
All of these cases seem to need the symbols from LLVM's new CodeView library to
link.

The specific executables are:

1. Swift Driver.
2. SIL Extract.
3. SIL Opt.
4. Swift IDE Test.
5. Swift LLVM Opt.
6. LLDB Module Import Test
diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
@@ -7,6 +7,8 @@ add_swift_executable(swift
   LINK_LIBRARIES
     swiftDriver
     swiftFrontendTool
+  LLVM_COMPONENT_DEPENDS
+    DebugInfoCodeView
 )
 
 target_link_libraries(swift edit)
diff --git a/tools/lldb-moduleimport-test/CMakeLists.txt b/tools/lldb-moduleimport-test/CMakeLists.txt
@@ -2,7 +2,9 @@ add_swift_executable(lldb-moduleimport-test
   lldb-moduleimport-test.cpp
   LINK_LIBRARIES
     swiftASTSectionImporter swiftFrontend swiftClangImporter
-    )
+  LLVM_COMPONENT_DEPENDS
+    DebugInfoCodeView
+)
 
 swift_install_in_component(testsuite-tools
     TARGETS lldb-moduleimport-test
diff --git a/tools/sil-extract/CMakeLists.txt b/tools/sil-extract/CMakeLists.txt
@@ -6,6 +6,8 @@ add_swift_executable(sil-extract
     swiftSILOptimizer
     swiftSerialization
     swiftClangImporter
+  LLVM_COMPONENT_DEPENDS
+    DebugInfoCodeView
 )
 
 swift_install_in_component(tools
diff --git a/tools/sil-opt/CMakeLists.txt b/tools/sil-opt/CMakeLists.txt
@@ -5,6 +5,8 @@ add_swift_executable(sil-opt
     swiftIRGen
     swiftSILGen
     swiftSILOptimizer
+  LLVM_COMPONENT_DEPENDS
+    DebugInfoCodeView
 )
 
 swift_install_in_component(tools
diff --git a/tools/swift-ide-test/CMakeLists.txt b/tools/swift-ide-test/CMakeLists.txt
@@ -6,6 +6,8 @@ add_swift_executable(swift-ide-test
     swiftDriver
     swiftFrontend
     swiftIDE
+  LLVM_COMPONENT_DEPENDS
+    DebugInfoCodeView
 )
 
 # If libxml2 is available, make it available for swift-ide-test.
diff --git a/tools/swift-llvm-opt/CMakeLists.txt b/tools/swift-llvm-opt/CMakeLists.txt
@@ -10,6 +10,9 @@ add_swift_executable(swift-llvm-opt
   # Clang libraries included to appease the linker on linux.
   clangBasic
   clangCodeGen
+
+  LLVM_COMPONENT_DEPENDS
+    DebugInfoCodeView
 )
 
 swift_install_in_component(tools

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@ add_swift_executable(swift`
`7`	`7`	`LINK_LIBRARIES`
`8`	`8`	`swiftDriver`
`9`	`9`	`swiftFrontendTool`
	`10`	`+ LLVM_COMPONENT_DEPENDS`
	`11`	`+ DebugInfoCodeView`
`10`	`12`	`)`
`11`	`13`
`12`	`14`	`target_link_libraries(swift edit)`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@ add_swift_executable(sil-extract`
`6`	`6`	`swiftSILOptimizer`
`7`	`7`	`swiftSerialization`
`8`	`8`	`swiftClangImporter`
	`9`	`+ LLVM_COMPONENT_DEPENDS`
	`10`	`+ DebugInfoCodeView`
`9`	`11`	`)`
`10`	`12`
`11`	`13`	`swift_install_in_component(tools`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@ add_swift_executable(sil-opt`
`5`	`5`	`swiftIRGen`
`6`	`6`	`swiftSILGen`
`7`	`7`	`swiftSILOptimizer`
	`8`	`+ LLVM_COMPONENT_DEPENDS`
	`9`	`+ DebugInfoCodeView`
`8`	`10`	`)`
`9`	`11`
`10`	`12`	`swift_install_in_component(tools`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@ add_swift_executable(swift-ide-test`
`6`	`6`	`swiftDriver`
`7`	`7`	`swiftFrontend`
`8`	`8`	`swiftIDE`
	`9`	`+ LLVM_COMPONENT_DEPENDS`
	`10`	`+ DebugInfoCodeView`
`9`	`11`	`)`
`10`	`12`
`11`	`13`	`# If libxml2 is available, make it available for swift-ide-test.`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,9 @@ add_swift_executable(swift-llvm-opt`
`10`	`10`	`# Clang libraries included to appease the linker on linux.`
`11`	`11`	`clangBasic`
`12`	`12`	`clangCodeGen`
	`13`	`+`
	`14`	`+ LLVM_COMPONENT_DEPENDS`
	`15`	`+ DebugInfoCodeView`
`13`	`16`	`)`
`14`	`17`
`15`	`18`	`swift_install_in_component(tools`