Speculatively try a different fix for LLVMCoverage linker issues.

rudkx · rudkx · commit 859b779f1501 · 2016-05-06T17:02:22.000-07:00
We're still hitting undefined symbols on Linux. Hopefully this clears
those up as well.
diff --git a/lib/IRGen/CMakeLists.txt b/lib/IRGen/CMakeLists.txt
@@ -48,4 +48,6 @@ add_swift_library(swiftIRGen
     # FIXME: Clang should really export these in some reasonable manner.
     clangCodeGen
     clangAST
+
+    LLVMCoverage
 )
diff --git a/lib/Parse/CMakeLists.txt b/lib/Parse/CMakeLists.txt
@@ -12,5 +12,8 @@ add_swift_library(swiftParse
   Scope.cpp
   LINK_LIBRARIES
     swiftSIL
-    swiftAST)
+    swiftAST
+
+    LLVMCoverage
+)
 
diff --git a/lib/SIL/CMakeLists.txt b/lib/SIL/CMakeLists.txt
@@ -33,5 +33,8 @@ add_swift_library(swiftSIL
   TypeLowering.cpp
   LINK_LIBRARIES
     swiftSerialization
-    swiftSema)
+    swiftSema
+
+    LLVMCoverage
+)
 
diff --git a/lib/SILGen/CMakeLists.txt b/lib/SILGen/CMakeLists.txt
@@ -26,4 +26,8 @@ add_swift_library(swiftSILGen
   SILGenProlog.cpp
   SILGenStmt.cpp
   SILGenType.cpp
-  LINK_LIBRARIES swiftSIL)
+  LINK_LIBRARIES
+    swiftSIL
+
+    LLVMCoverage
+)
diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
@@ -4,7 +4,6 @@ add_swift_executable(swift
   autolink_extract_main.cpp
   modulewrap_main.cpp
   LINK_LIBRARIES
-    LLVMCoverage
     LLVMDebugInfoCodeView
     swiftDriver
     swiftFrontendTool
diff --git a/tools/lldb-moduleimport-test/CMakeLists.txt b/tools/lldb-moduleimport-test/CMakeLists.txt
@@ -2,7 +2,6 @@ add_swift_executable(lldb-moduleimport-test
   lldb-moduleimport-test.cpp
   LINK_LIBRARIES
     swiftASTSectionImporter swiftFrontend swiftClangImporter
-    LLVMCoverage
     LLVMDebugInfoCodeView
     )
 
diff --git a/tools/sil-extract/CMakeLists.txt b/tools/sil-extract/CMakeLists.txt
@@ -6,7 +6,6 @@ add_swift_executable(sil-extract
     swiftSILOptimizer
     swiftSerialization
     swiftClangImporter
-    LLVMCoverage
     LLVMDebugInfoCodeView
 )
 
diff --git a/tools/sil-opt/CMakeLists.txt b/tools/sil-opt/CMakeLists.txt
@@ -5,7 +5,6 @@ add_swift_executable(sil-opt
     swiftIRGen
     swiftSILGen
     swiftSILOptimizer
-    LLVMCoverage
     LLVMDebugInfoCodeView
 )
 
diff --git a/tools/swift-ide-test/CMakeLists.txt b/tools/swift-ide-test/CMakeLists.txt
@@ -6,7 +6,6 @@ add_swift_executable(swift-ide-test
     swiftDriver
     swiftFrontend
     swiftIDE
-    LLVMCoverage
     LLVMDebugInfoCodeView
 )
 
diff --git a/tools/swift-llvm-opt/CMakeLists.txt b/tools/swift-llvm-opt/CMakeLists.txt
@@ -11,7 +11,6 @@ add_swift_executable(swift-llvm-opt
   clangBasic
   clangCodeGen
 
-  LLVMCoverage
   LLVMDebugInfoCodeView
 )
 
diff --git a/tools/swift-remoteast-test/CMakeLists.txt b/tools/swift-remoteast-test/CMakeLists.txt
@@ -3,7 +3,6 @@ add_swift_executable(swift-remoteast-test
   LINK_LIBRARIES
     swiftFrontendTool
     swiftRemoteAST
-    LLVMCoverage
 )
 
 target_link_libraries(swift-remoteast-test edit)
diff --git a/unittests/Parse/CMakeLists.txt b/unittests/Parse/CMakeLists.txt
@@ -10,6 +10,5 @@ target_link_libraries(SwiftParseTests
     swiftClangImporter
     swiftParse
     swiftAST
-    LLVMCoverage
 )
 

Original file line number	Diff line number	Diff line change
`@@ -48,4 +48,6 @@ add_swift_library(swiftIRGen`
`48`	`48`	`# FIXME: Clang should really export these in some reasonable manner.`
`49`	`49`	`clangCodeGen`
`50`	`50`	`clangAST`
	`51`	`+`
	`52`	`+ LLVMCoverage`
`51`	`53`	`)`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ add_swift_executable(lldb-moduleimport-test`
`2`	`2`	`lldb-moduleimport-test.cpp`
`3`	`3`	`LINK_LIBRARIES`
`4`	`4`	`swiftASTSectionImporter swiftFrontend swiftClangImporter`
`5`		`- LLVMCoverage`
`6`	`5`	`LLVMDebugInfoCodeView`
`7`	`6`	`)`
`8`	`7`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ add_swift_executable(sil-extract`
`6`	`6`	`swiftSILOptimizer`
`7`	`7`	`swiftSerialization`
`8`	`8`	`swiftClangImporter`
`9`		`- LLVMCoverage`
`10`	`9`	`LLVMDebugInfoCodeView`
`11`	`10`	`)`
`12`	`11`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@ add_swift_executable(sil-opt`
`5`	`5`	`swiftIRGen`
`6`	`6`	`swiftSILGen`
`7`	`7`	`swiftSILOptimizer`
`8`		`- LLVMCoverage`
`9`	`8`	`LLVMDebugInfoCodeView`
`10`	`9`	`)`
`11`	`10`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ add_swift_executable(swift-ide-test`
`6`	`6`	`swiftDriver`
`7`	`7`	`swiftFrontend`
`8`	`8`	`swiftIDE`
`9`		`- LLVMCoverage`
`10`	`9`	`LLVMDebugInfoCodeView`
`11`	`10`	`)`
`12`	`11`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ add_swift_executable(swift-llvm-opt`
`11`	`11`	`clangBasic`
`12`	`12`	`clangCodeGen`
`13`	`13`
`14`		`- LLVMCoverage`
`15`	`14`	`LLVMDebugInfoCodeView`
`16`	`15`	`)`
`17`	`16`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@ add_swift_executable(swift-remoteast-test`
`3`	`3`	`LINK_LIBRARIES`
`4`	`4`	`swiftFrontendTool`
`5`	`5`	`swiftRemoteAST`
`6`		`- LLVMCoverage`
`7`	`6`	`)`
`8`	`7`
`9`	`8`	`target_link_libraries(swift-remoteast-test edit)`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,5 @@ target_link_libraries(SwiftParseTests`
`10`	`10`	`swiftClangImporter`
`11`	`11`	`swiftParse`
`12`	`12`	`swiftAST`
`13`		`- LLVMCoverage`
`14`	`13`	`)`
`15`	`14`