Build: Correct BlocksRuntime dependency for Darwin

swiftlang · Sep 8, 2022 · f7f9d48 · f7f9d48
1 parent 4bf826d
commit f7f9d48
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -137,8 +137,10 @@ if(LibRT_FOUND)
 endif()
 target_link_libraries(dispatch PRIVATE
   Threads::Threads)
-target_link_libraries(dispatch PUBLIC
-  BlocksRuntime::BlocksRuntime)
+if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
+  target_link_libraries(dispatch PUBLIC
+    BlocksRuntime::BlocksRuntime)
+endif()
 if(CMAKE_SYSTEM_NAME STREQUAL Windows)
   target_link_libraries(dispatch PRIVATE
     ShLwApi

diff --git a/src/swift/CMakeLists.txt b/src/swift/CMakeLists.txt
@@ -38,8 +38,11 @@ set_target_properties(swiftDispatch PROPERTIES
   Swift_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/swift
   INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/swift)
 target_link_libraries(swiftDispatch PRIVATE
-  DispatchStubs
-  BlocksRuntime::BlocksRuntime)
+  DispatchStubs)
+if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
+  target_link_libraries(swiftDispatch PRIVATE
+    BlocksRuntime::BlocksRuntime)
+endif()
 target_link_libraries(swiftDispatch PUBLIC
   dispatch)
 add_dependencies(swiftDispatch module-maps)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -99,8 +99,11 @@ function(add_unit_test name)
   target_link_libraries(${name}
                         PRIVATE
                           dispatch
-                          Threads::Threads
-                          BlocksRuntime::BlocksRuntime)
+                          Threads::Threads)
+  if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
+    target_link_libraries(${name} PRIVATE
+      BlocksRuntime::BlocksRuntime)
+  endif()
   target_link_libraries(${name} PRIVATE bsdtests)
   add_test(NAME ${name}
            COMMAND bsdtestharness $<TARGET_FILE:${name}>)