Merge pull request swiftlang#22805 from compnerd/interfacing-the-system

swift-ci · web-flow · commit d6b379a2486d · 2019-02-21T23:47:21.000-08:00
diff --git a/unittests/runtime/CMakeLists.txt b/unittests/runtime/CMakeLists.txt
@@ -30,6 +30,8 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND
     list(APPEND PLATFORM_TARGET_LINK_LIBRARIES
       ${EXECINFO_LIBRARY}
       )
+  elseif(SWIFT_HOST_VARIANT STREQUAL windows)
+    list(APPEND PLATFORM_TARGET_LINK_LIBRARIES DbgHelp)
   endif()
 
   add_swift_unittest(SwiftRuntimeTests
diff --git a/unittests/runtime/LongTests/CMakeLists.txt b/unittests/runtime/LongTests/CMakeLists.txt
@@ -25,6 +25,8 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND
     list(APPEND PLATFORM_TARGET_LINK_LIBRARIES
       ${EXECINFO_LIBRARY}
       )
+  elseif(SWIFT_HOST_VARIANT STREQUAL windows)
+    list(APPEND PLATFORM_TARGET_LINK_LIBRARIES DbgHelp)
   endif()
 
   add_swift_unittest(SwiftRuntimeLongTests

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,8 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND`
`30`	`30`	`list(APPEND PLATFORM_TARGET_LINK_LIBRARIES`
`31`	`31`	`${EXECINFO_LIBRARY}`
`32`	`32`	`)`
	`33`	`+ elseif(SWIFT_HOST_VARIANT STREQUAL windows)`
	`34`	`+ list(APPEND PLATFORM_TARGET_LINK_LIBRARIES DbgHelp)`
`33`	`35`	`endif()`
`34`	`36`
`35`	`37`	`add_swift_unittest(SwiftRuntimeTests`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND`
`25`	`25`	`list(APPEND PLATFORM_TARGET_LINK_LIBRARIES`
`26`	`26`	`${EXECINFO_LIBRARY}`
`27`	`27`	`)`
	`28`	`+ elseif(SWIFT_HOST_VARIANT STREQUAL windows)`
	`29`	`+ list(APPEND PLATFORM_TARGET_LINK_LIBRARIES DbgHelp)`
`28`	`30`	`endif()`
`29`	`31`
`30`	`32`	`add_swift_unittest(SwiftRuntimeLongTests`