[Build] Fix some issues with the standalone library build.

When we're building static libraries, we don't need to include the
threading objects in both Concurrency and Core, and we also don't need
two copies of the threading library's fatal error handler.

rdar://90776105

Author: al45tair

stdlib/public/Concurrency/CMakeLists.txt

@@ -25,11 +25,16 @@ endif()
 set(SWIFT_RUNTIME_CONCURRENCY_C_FLAGS)
 set(SWIFT_RUNTIME_CONCURRENCY_SWIFT_FLAGS)
 
-set(swift_concurrency_private_link_libraries swiftThreading)
+set(swift_concurrency_private_link_libraries)
 if(CMAKE_SYSTEM_NAME STREQUAL Windows)
   list(APPEND swift_concurrency_private_link_libraries Synchronization)
 endif()
 
+set(swift_concurrency_incorporate_object_libraries)
+if(NOT SWIFT_BUILD_STATIC_STDLIB)
+  list(APPEND swift_concurrency_incorporate_object_libraries swiftThreading)
+endif()
+
 if("${SWIFT_CONCURRENCY_GLOBAL_EXECUTOR}" STREQUAL "dispatch")
   if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
     include_directories(AFTER
@@ -72,6 +77,11 @@ endif()
 list(APPEND SWIFT_RUNTIME_CONCURRENCY_C_FLAGS
   "-D__STDC_WANT_LIB_EXT1__=1")
 
+if(SWIFT_BUILD_STATIC_STDLIB)
+  list(APPEND SWIFT_RUNTIME_CONCURRENCY_C_FLAGS
+    "-DSWIFT_BUILD_STATIC_STDLIB=1")
+endif()
+
 add_swift_target_library(swift_Concurrency ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   ../CompatibilityOverride/CompatibilityOverride.cpp
   Actor.cpp
@@ -132,7 +142,7 @@ add_swift_target_library(swift_Concurrency ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I
   SWIFT_MODULE_DEPENDS_WINDOWS CRT
 
   PRIVATE_LINK_LIBRARIES ${swift_concurrency_private_link_libraries}
-
+  INCORPORATE_OBJECT_LIBRARIES ${swift_concurrency_incorporate_object_libraries}
   LINK_LIBRARIES ${swift_concurrency_link_libraries}
 
   C_COMPILE_FLAGS

stdlib/public/Concurrency/Error.cpp

@@ -35,6 +35,7 @@ void swift::swift_Concurrency_fatalError(uint32_t flags, const char *format,
   swift_Concurrency_fatalErrorv(flags, format, val);
 }
 
+#if !SWIFT_BUILD_STATIC_STDLIB
 // Handle fatal errors from the threading library
 SWIFT_ATTRIBUTE_NORETURN
 SWIFT_FORMAT(1, 2)
@@ -44,3 +45,4 @@ void swift::threading::fatal(const char *format, ...) {
   va_start(val, format);
   swift_Concurrency_fatalErrorv(0, format, val);
 }
+#endif // !SWIFT_BUILD_STATIC_STDLIB

stdlib/public/core/CMakeLists.txt

@@ -245,7 +245,7 @@ endif()
 set(GROUP_INFO_JSON_FILE ${CMAKE_CURRENT_SOURCE_DIR}/GroupInfo.json)
 set(swift_core_link_flags "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}")
 set(swift_core_framework_depends)
-set(swift_core_private_link_libraries swiftThreading)
+set(swift_core_private_link_libraries)
 set(swift_stdlib_compile_flags "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}")
 
 if(SWIFT_PRIMARY_VARIANT_SDK STREQUAL CYGWIN)
@@ -299,6 +299,7 @@ list(APPEND swift_core_incorporate_object_libraries swiftRuntime)
 list(APPEND swift_core_incorporate_object_libraries swiftLLVMSupport)
 list(APPEND swift_core_incorporate_object_libraries swiftDemangling)
 list(APPEND swift_core_incorporate_object_libraries swiftStdlibStubs)
+list(APPEND swift_core_incorporate_object_libraries swiftThreading)
 if(SWIFT_STDLIB_HAS_COMMANDLINE)
   list(APPEND swift_core_incorporate_object_libraries swiftCommandLineSupport)
 endif()