build: split out the SDK overlay

This splits out the SDK overlay component and libdispatch runtime
itself.  Doing so enables the re-use of libdispatch with and without
swift and makes the behaviour similar across Darwin and other platforms.

Author: compnerd

src/CMakeLists.txt

@@ -72,25 +72,41 @@ target_sources(dispatch
                PRIVATE
                  block.cpp)
 if(HAVE_OBJC)
+  # TODO(compnerd) split DispatchStubs.cc into a separate component for the ObjC
+  # registration and a separate component for the swift compiler's emission of a
+  # call to the ObjC autorelease elision entry point.
   target_sources(dispatch
                  PRIVATE
                    data.m
-                   object.m)
+                   object.m
+                   swift/DispatchStubs.cc)
 endif()
 if(ENABLE_SWIFT)
   set(swift_optimization_flags)
   if(NOT CMAKE_BUILD_TYPE MATCHES Debug)
     set(swift_optimization_flags -O)
   endif()
+
+  # TODO(compnerd) fix the swift compiler to directly call the swift entry point
+  # if ObjC Interop is disabled to avoid having the stub for the ObjC
+  # autorelease elision entry point
+  add_library(DispatchStubs
+              OBJECT
+                swift/DispatchStubs.cc)
+  target_include_directories(DispatchStubs
+                             PRIVATE
+                               ${PROJECT_SOURCE_DIR})
+  set_target_properties(DispatchStubs
+                        PROPERTIES
+                          POSITION_INDEPENDENT_CODE YES)
+
   add_swift_library(swiftDispatch
                     MODULE_NAME
                       Dispatch
                     MODULE_LINK_NAME
                       dispatch
                     MODULE_PATH
                       ${CMAKE_CURRENT_BINARY_DIR}/swift/Dispatch.swiftmodule
-                    OUTPUT
-                      ${CMAKE_CURRENT_BINARY_DIR}/swiftDispatch.o
                     SOURCES
                       swift/Block.swift
                       swift/Data.swift
@@ -110,23 +126,14 @@ if(ENABLE_SWIFT)
                       -I ${PROJECT_SOURCE_DIR}
                       -I/usr/include
                       ${swift_optimization_flags}
+                    LINK_FLAGS
+                      $<TARGET_OBJECTS:DispatchStubs>
                     DEPENDS
-                      ${PROJECT_SOURCE_DIR}/dispatch/module.modulemap)
-
-  get_filename_component(swift_toolchain ${CMAKE_SWIFT_COMPILER} DIRECTORY)
-  get_filename_component(swift_toolchain ${swift_toolchain} DIRECTORY)
-  set(swift_runtime_libdir ${swift_toolchain}/lib/${swift_dir}/${swift_os}/${swift_arch})
-
-  target_sources(dispatch
-                 PRIVATE
-                   swift/DispatchStubs.cc
-                   ${CMAKE_CURRENT_BINARY_DIR}/swiftDispatch.o
-                   ${swift_runtime_libdir}/swiftrt.o)
-  if(CMAKE_BUILD_TYPE MATCHES Debug)
-    target_link_libraries(dispatch
-                          PRIVATE
-                            swiftSwiftOnoneSupport)
-  endif()
+                      ${PROJECT_SOURCE_DIR}/dispatch/module.modulemap
+                      module-map-symlinks
+                      DispatchStubs
+                    TARGET_FILES
+                      swiftDispatch_TARGET_FILES)
 endif()
 if(ENABLE_DTRACE)
   dtrace_usdt_probe(${CMAKE_CURRENT_SOURCE_DIR}/provider.d
@@ -231,8 +238,6 @@ add_custom_command(TARGET dispatch POST_BUILD
                    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:dispatch> .libs
                    COMMENT "Copying libdispatch to .libs")
 
-get_swift_host_arch(SWIFT_HOST_ARCH)
-
 install(TARGETS
           dispatch
         DESTINATION
@@ -242,6 +247,18 @@ if(ENABLE_SWIFT)
             ${CMAKE_CURRENT_BINARY_DIR}/swift/Dispatch.swiftmodule
             ${CMAKE_CURRENT_BINARY_DIR}/swift/Dispatch.swiftdoc
           DESTINATION
-            "${INSTALL_TARGET_DIR}/${SWIFT_HOST_ARCH}")
+            ${INSTALL_TARGET_DIR}/${swift_arch})
+
+  if(BUILD_SHARED_LIBS)
+    set(library_kind SHARED)
+  else()
+    set(library_kind STATIC)
+  endif()
+  set(swiftDispatch_OUTPUT_FILE
+      ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_${library_kind}_LIBRARY_PREFIX}swiftDispatch${CMAKE_${library_kind}_LIBRARY_SUFFIX})
+  install(FILES
+            ${swiftDispatch_OUTPUT_FILE}
+          DESTINATION
+            ${INSTALL_TARGET_DIR})
 endif()
 

tests/CMakeLists.txt

@@ -56,12 +56,6 @@ if(BSD_OVERLAY_FOUND)
                         PRIVATE
                           ${BSD_OVERLAY_LDFLAGS})
 endif()
-if(ENABLE_SWIFT)
-  target_link_libraries(bsdtestharness
-                        PRIVATE
-                          swiftCore-${swift_os}-${swift_arch}
-                          swiftSwiftOnoneSupport-${swift_os}-${swift_arch})
-endif()
 
 function(add_unit_test name)
   set(options DISABLED_TEST;NO_BSD_OVERLAY)
@@ -83,10 +77,6 @@ function(add_unit_test name)
     # For testing in swift.org CI system; make deadlines lenient by default
     # to reduce probability of test failures due to machine load.
     target_compile_options(${name} PRIVATE -DLENIENT_DEADLINES=1)
-    target_link_libraries(${name}
-                          PRIVATE
-                            swiftCore-${swift_os}-${swift_arch}
-                            swiftSwiftOnoneSupport-${swift_os}-${swift_arch})
   endif()
   target_include_directories(${name}
                              SYSTEM BEFORE PRIVATE
@@ -114,12 +104,6 @@ function(add_unit_test name)
                           PRIVATE
                             ${BSD_OVERLAY_LDFLAGS})
   endif()
-  if(ENABLE_SWIFT)
-    target_link_libraries(${name}
-                          PRIVATE
-                            swiftCore-${swift_os}-${swift_arch}
-                            swiftSwiftOnoneSupport-${swift_os}-${swift_arch})
-  endif()
   target_link_libraries(${name} PRIVATE bsdtests)
   add_test(NAME ${name}
            COMMAND bsdtestharness $<TARGET_FILE:${name}>)