build: use the same linker for the tests

We would previously not honor the linker settings for the tests.  Adjust
the build process to account for that.

Author: compnerd

CMakeLists.txt

@@ -30,6 +30,7 @@ include(CheckLibraryExists)
 include(CheckSymbolExists)
 include(GNUInstallDirs)
 include(SwiftSupport)
+include(DispatchUtilities)
 
 set(SWIFT_LIBDIR "lib" CACHE PATH "Library folder name, defined by swift main buildscript")
 set(INSTALL_LIBDIR "${SWIFT_LIBDIR}" CACHE PATH "Path where the libraries should be installed")

cmake/modules/DispatchUtilties.cmake

@@ -0,0 +1,15 @@
+
+function(dispatch_set_linker target)
+  if(USE_GOLD_LINKER)
+    set_property(TARGET ${target}
+                 APPEND_STRING
+                 PROPERTY LINK_FLAGS
+                   -fuse-ld=gold)
+  endif()
+  if(USE_LLD_LINKER)
+    set_property(TARGET ${target}
+                 APPEND_STRING
+                 PROPERTY LINK_FLAGS
+                   -fuse-ld=lld)
+  endif()
+endfunction()

src/CMakeLists.txt

@@ -212,18 +212,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
                  "-Xlinker -dead_strip"
                  "-Xlinker -alias_list -Xlinker ${CMAKE_SOURCE_DIR}/xcodeconfig/libdispatch.aliases")
 endif()
-if(USE_GOLD_LINKER)
-  set_property(TARGET dispatch
-               APPEND_STRING
-               PROPERTY LINK_FLAGS
-                 -fuse-ld=gold)
-endif()
-if(USE_LLD_LINKER)
-  set_property(TARGET dispatch
-               APPEND_STRING
-               PROPERTY LINK_FLAGS
-                 -fuse-ld=lld)
-endif()
+dispatch_set_linker(dispatch)
 
 # Temporary staging; the various swift projects that depend on libdispatch
 # all expect libdispatch.so to be in src/.libs/libdispatch.so

tests/CMakeLists.txt

@@ -23,6 +23,7 @@ endif()
 
 add_executable(bsdtestharness
                bsdtestharness.c)
+dispatch_set_linker(bsdtestharness)
 target_include_directories(bsdtestharness
                            PRIVATE
                              ${CMAKE_CURRENT_BINARY_DIR}
@@ -84,6 +85,7 @@ function(add_unit_test name)
   target_compile_options(${name} PRIVATE -fblocks)
   # TODO(compnerd) make this portable
   target_compile_options(${name} PRIVATE -Wall -Wno-deprecated-declarations)
+  dispatch_set_linker(${name})
   target_link_libraries(${name} PRIVATE dispatch Threads::Threads)
   if(WITH_BLOCKS_RUNTIME)
     target_link_libraries(${name} PRIVATE BlocksRuntime)