[Build] Add catalyst support to SwiftStdlibCurrentOS.

Add catalyst support for SwiftStdlibCurrentOS.

Also, set a minimum deployment target when building Concurrency;
this stops the build failing when we're trying to build on older
systems where Concurrency didn't really exist yet.

rdar://150966361

Author: al45tair

Runtimes/Core/CMakeLists.txt

@@ -78,14 +78,14 @@ set(SwiftCore_VENDOR_MODULE_DIR "${SwiftCore_CMAKE_MODULES_DIR}/vendor"
 include(GNUInstallDirs)
 include(CheckSymbolExists)
 include(CheckIncludeFileCXX)
-include(AvailabilityMacros)
 include(CompilerSettings)
 include(DefaultSettings)
 include(EmitSwiftInterface)
 include(PlatformInfo)
 include(gyb)
 include(ResourceEmbedding)
 include(CatalystSupport)
+include(AvailabilityMacros)
 
 check_symbol_exists("asl_log" "asl.h" SwiftCore_HAS_ASL)
 check_symbol_exists("dladdr" "dlfcn.h" SwiftCore_HAS_DLADDR)

Runtimes/Core/cmake/modules/AvailabilityMacros.cmake

@@ -7,18 +7,28 @@ foreach(def ${availability_defs})
   add_compile_options("$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -define-availability -Xfrontend \"${def}\">")
 
   if("${def}" MATCHES "SwiftStdlib .*")
-    # For each SwiftStdlib x.y, also define SwiftStdlibTargetOS x.y, which,
+    # For each SwiftStdlib x.y, also define SwiftStdlibCurrentOS x.y, which,
     # will expand to the current `-target` platform if the macro defines a
     # newer platform as its availability.
     #
     # There is a setting, SwiftCore_ENABLE_STRICT_AVAILABILITY, which if set
     # ON will cause us to use the "proper" availability instead.
     string(REPLACE "SwiftStdlib" "SwiftStdlibCurrentOS" current "${def}")
     if(NOT SwiftCore_ENABLE_STRICT_AVAILABILITY AND SwiftCore_SWIFT_AVAILABILITY_PLATFORM)
-      string(REGEX MATCH "${SwiftCore_SWIFT_AVAILABILITY_PLATFORM} ([0-9]+(\.[0-9]+)+)" platform_version "${def}")
-      string(REGEX MATCH "[0-9]+(\.[0-9]+)+" version "${platform_version}")
-      if(NOT version STREQUAL "9999" AND version VERSION_GREATER CMAKE_OSX_DEPLOYMENT_TARGET)
-        string(REGEX REPLACE ":.*" ":${SwiftCore_SWIFT_AVAILABILITY_PLATFORM} ${CMAKE_OSX_DEPLOYMENT_TARGET}" current "${current}")
+      if(SwiftCore_SWIFT_AVAILABILITY_PLATFORM STREQUAL "macOS" and SwiftCore_VARIANT_AVAILABILITY_PLATFORM STREQUAL "iOS")
+        string(REGEX MATCH "iOS ([0-9]+(\.[0-9]+)+)" ios_platform_version "${def}")
+        string(REGEX MATCH "[0-9]+(\.[0-9]+)+" ios_version "${ios_platform_version}")
+        string(REGEX MATCH "macOS ([0-9]+(\.[0-9]+)+)" macos_platform_version "${def}")
+        string(REGEX MATCH "[0-9]+(\.[0-9]+)+" macos_version "${macos_platform_version}")
+        if((NOT macos_version STREQUAL "9999" OR NOT ios_version STREQUAL "9999") AND (macos_version VERSION_GREATER CMAKE_OSX_DEPLOYMENT_TARGET OR ios_version VERSION_GREATER SwiftCore_VARIANT_DEPLOYMENT_VERSION))
+          string(REGEX REPLACE ":.*" ": macOS ${CMAKE_OSX_DEPLOYMENT_VERSION}, iOS ${SwiftCore_VARIANT_DEPLOYMENT_VERSION}" current "${current}")
+        endif()
+      else()
+        string(REGEX MATCH "${SwiftCore_SWIFT_AVAILABILITY_PLATFORM} ([0-9]+(\.[0-9]+)+)" platform_version "${def}")
+        string(REGEX MATCH "[0-9]+(\.[0-9]+)+" version "${platform_version}")
+        if(NOT version STREQUAL "9999" AND version VERSION_GREATER CMAKE_OSX_DEPLOYMENT_TARGET)
+          string(REGEX REPLACE ":.*" ":${SwiftCore_SWIFT_AVAILABILITY_PLATFORM} ${CMAKE_OSX_DEPLOYMENT_TARGET}" current "${current}")
+        endif()
       endif()
     endif()
     add_compile_options("$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -define-availability -Xfrontend \"${current}\">")

Runtimes/Core/cmake/modules/CatalystSupport.cmake

@@ -34,5 +34,12 @@ if(SwiftCore_COMPILER_VARIANT_TARGET)
     set(SwiftCore_VARIANT_MODULE_TRIPLE "${module_triple}" CACHE STRING "Triple used for installed swift{module,interface} files for the target variant")
     mark_as_advanced(SwiftCore_VARIANT_MODULE_TRIPLE)
     message(CONFIGURE_LOG "Swift target variant module triple: ${module_triple}")
+
+    string(JSON triple GET "${target_info_json}" "target" "triple")
+    if(triple MATCHES "apple-([a-zA-Z]+)([0-9]+[.0-9]*)-macabi")
+      set(SwiftCore_VARIANT_DEPLOYMENT_VERSION "${CMAKE_MATCH_2}")
+      mark_as_advanced(SwiftCore_VARIANT_DEPLOYMENT_VERSION)
+      message(CONFIGURE_LOG "Swift target variant deployment version: ${SwiftCore_VARIANT_DEPLOYMENT_VERSION}")
+    endif()
   endif()
 endif()

Runtimes/Core/cmake/modules/PlatformInfo.cmake

@@ -37,14 +37,14 @@ if(NOT SwiftCore_ARCH_SUBDIR)
   message(CONFIGURE_LOG "Swift Arch: ${arch}")
 endif()
 
-if(NOT SwiftCore_SWIFT_AVAILABILITY_PLATFORM)
-  set(availability_platform_macosx "macOS")
-  set(availability_platform_ios "iOS")
-  set(availability_platform_watchos "watchOS")
-  set(availability_platform_tvos "tvOS")
-  set(availability_platform_xros "visionOS")
-  set(availability_platform_bridgeos "bridgeOS")
+set(availability_platform_macosx "macOS")
+set(availability_platform_ios "iOS")
+set(availability_platform_watchos "watchOS")
+set(availability_platform_tvos "tvOS")
+set(availability_platform_xros "visionOS")
+set(availability_platform_bridgeos "bridgeOS")
 
+if(NOT SwiftCore_SWIFT_AVAILABILITY_PLATFORM)
   if(SwiftCore_SWIFT_MODULE_TRIPLE MATCHES ".*-([^-]+)-simulator$")
     set(platform "${CMAKE_MATCH_1}")
   elseif(SwiftCore_SWIFT_MODULE_TRIPLE MATCHES ".*-([^-]+)$")
@@ -59,3 +59,17 @@ if(NOT SwiftCore_SWIFT_AVAILABILITY_PLATFORM)
     message(ERROR "Unknown platform ${platform} for availability")
   endif()
 endif()
+
+if(SwiftCore_VARIANT_MODULE_TRIPLE)
+  if(SwiftCore_VARIANT_MODULE_TRIPLE MATCHES ".*-([^-]+)$")
+    set(platform "${CMAKE_MATCH_1}")
+  else()
+    message(ERROR "Unable to extract platform name from triple ${SwiftCore_SWIFT_MODULE_TRIPLE}")
+  endif()
+
+  if(availability_platform_${platform})
+    set(SwiftCore_VARIANT_AVAILABILITY_PLATFORM "${availability_platform_${platform}}")
+  else()
+    message(ERROR "Unknown platform ${platform} for variant availability")
+  endif()
+endif()

stdlib/cmake/modules/AddSwiftStdlib.cmake

@@ -1005,18 +1005,34 @@ function(add_swift_target_library_single target name)
     list(APPEND SWIFTLIB_SINGLE_SWIFT_COMPILE_FLAGS "-Xfrontend" "-define-availability" "-Xfrontend" "${def}")
 
     if("${def}" MATCHES "SwiftStdlib .*")
-      # For each SwiftStdlib x.y, also define SwiftStdlibTargetOS x.y, which,
+      # For each SwiftStdlib x.y, also define SwiftStdlibCurrentOS x.y, which,
       # will expand to the current `-target` platform if the macro defines a
       # newer platform as its availability.
       #
       # There is a setting, SWIFT_STDLIB_ENABLE_STRICT_AVAILABILITY, which if set
       # ON will cause us to use the "proper" availability instead.
       string(REPLACE "SwiftStdlib" "SwiftStdlibCurrentOS" current "${def}")
       if(NOT SWIFT_STDLIB_ENABLE_STRICT_AVAILABILITY AND SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_AVAILABILITY_NAME)
-        string(REGEX MATCH "${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_AVAILABILITY_NAME} ([0-9]+(\.[0-9]+)+)" platform_version "${def}")
-        string(REGEX MATCH "[0-9]+(\.[0-9]+)+" version "${platform_version}")
-        if(NOT version STREQUAL "9999" AND version VERSION_GREATER "${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_DEPLOYMENT_VERSION}")
-          string(REGEX REPLACE ":.*" ":${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_AVAILABILITY_NAME} ${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_DEPLOYMENT_VERSION}" current "${current}")
+        if(SWIFTLIB_SINGLE_SDK STREQUAL "OSX" AND SWIFTLIB_SINGLE_MACCATALYST_BUILD_FLAVOR STREQUAL "ios-like")
+          string(REGEX MATCH "iOS ([0-9]+(\.[0-9]+)+)" platform_version "${def}")
+          string(REGEX MATCH "[0-9]+(\.[0-9]+)+" version "${platform_version}")
+          if(NOT version STREQUAL "9999" AND version VERSION_GREATER "${SWIFT_DARWIN_DEPLOYMENT_VERSION_MACCATALYST}")
+            string(REGEX REPLACE ":.*" ":iOS ${SWIFT_DARWIN_DEPLOYMENT_VERSION_MACCATALYST}" current "${current}")
+          endif()
+        elseif(SWIFTLIB_SINGLE_SDK STREQUAL "OSX" AND SWIFTLIB_SINGLE_MACCATALYST_BUILD_FLAVOR STREQUAL "zippered")
+          string(REGEX MATCH "iOS ([0-9]+(\.[0-9]+)+)" ios_platform_version "${def}")
+          string(REGEX MATCH "[0-9]+(\.[0-9]+)+" ios_version "${ios_platform_version}")
+          string(REGEX MATCH "macOS ([0-9]+(\.[0-9]+)+)" macos_platform_version "${def}")
+          string(REGEX MATCH "[0-9]+(\.[0-9]+)+" macos_version "${macos_platform_version}")
+          if((NOT macos_version STREQUAL "9999" OR NOT ios_version STREQUAL "9999") AND (macos_version VERSION_GREATER "${SWIFT_SDK_OSX_DEPLOYMENT_VERSION}" OR ios_version VERSION_GREATER "${SWIFT_DARWIN_DEPLOYMENT_VERSION_MACCATALYST}"))
+            string(REGEX REPLACE ":.*" ": macOS ${SWIFT_SDK_OSX_DEPLOYMENT_VERSION}, iOS ${SWIFT_DARWIN_DEPLOYMENT_VERSION_MACCATALYST}" current "${current}")
+          endif()
+        else()
+          string(REGEX MATCH "${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_AVAILABILITY_NAME} ([0-9]+(\.[0-9]+)+)" platform_version "${def}")
+          string(REGEX MATCH "[0-9]+(\.[0-9]+)+" version "${platform_version}")
+          if(NOT version STREQUAL "9999" AND version VERSION_GREATER "${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_DEPLOYMENT_VERSION}")
+            string(REGEX REPLACE ":.*" ":${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_AVAILABILITY_NAME} ${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_DEPLOYMENT_VERSION}" current "${current}")
+          endif()
         endif()
       endif()
 

stdlib/public/Concurrency/CMakeLists.txt

@@ -214,6 +214,13 @@ if((SWIFT_BUILD_CLANG_OVERLAYS
   set(SWIFT_CONCURRENCY_DEPENDENCIES _Builtin_float)
 endif()
 
+# Build with a minimum deployment target of 10.15
+if(SWIFT_DARWIN_DEPLOYMENT_VERSION_OSX VERSION_LESS "10.15")
+  set(osx_deployment_target "10.15")
+else()
+  set(osx_deployment_target "${SWIFT_DARWIN_DEPLOYMENT_VERSION_OSX}")
+endif()
+
 add_swift_target_library(swift_Concurrency ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   ${SWIFT_RUNTIME_CONCURRENCY_C_SOURCES}
   ${SWIFT_RUNTIME_CONCURRENCY_EXECUTOR_SOURCES}
@@ -240,6 +247,8 @@ add_swift_target_library(swift_Concurrency ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I
     ${swift_concurrency_incorporate_object_libraries_so}
   LINK_LIBRARIES ${swift_concurrency_link_libraries}
 
+  DEPLOYMENT_VERSION_OSX ${osx_deployment_target}
+
   C_COMPILE_FLAGS
     -Dswift_Concurrency_EXPORTS ${SWIFT_RUNTIME_CONCURRENCY_C_FLAGS}
     -I${SWIFT_SOURCE_DIR}/stdlib/include