[CMake] Add -simulator to simulator target triples.

The build systems that drive Swift compilation have been using the
"simulator" environment as part of the increasingly inaccurately
named "target triple" to specify simulator targets for several
years... except our own hand-rolled build system. Identify
simulator targets and append "-simulator" to their target
triples.

Author: DougGregor

cmake/modules/SwiftConfigureSDK.cmake

@@ -30,6 +30,7 @@ function(_report_sdk prefix)
     message(STATUS "  Deployment version: ${SWIFT_SDK_${prefix}_DEPLOYMENT_VERSION}")
     message(STATUS "  Version min name: ${SWIFT_SDK_${prefix}_VERSION_MIN_NAME}")
     message(STATUS "  Triple name: ${SWIFT_SDK_${prefix}_TRIPLE_NAME}")
+    message(STATUS "  Simulator: ${SWIFT_SDK_${prefix}_IS_SIMULATOR}")
   endif()
   if(SWIFT_SDK_${prefix}_MODULE_ARCHITECTURES)
     message(STATUS "  Module Architectures: ${SWIFT_SDK_${prefix}_MODULE_ARCHITECTURES}")
@@ -112,6 +113,7 @@ endfunction()
 #   SWIFT_SDK_${prefix}_VERSION_MIN_NAME    Version min name for this SDK
 #   SWIFT_SDK_${prefix}_TRIPLE_NAME         Triple name for this SDK
 #   SWIFT_SDK_${prefix}_ARCHITECTURES       Architectures (as a list)
+#   SWIFT_SDK_${prefix}_IS_SIMULATOR        Whether this is a simulator target.
 #   SWIFT_SDK_${prefix}_ARCH_${ARCH}_TRIPLE Triple name
 macro(configure_sdk_darwin
     prefix name deployment_version xcrun_name
@@ -172,6 +174,13 @@ macro(configure_sdk_darwin
     "${SWIFT_SDK_${prefix}_ARCHITECTURES}"        # rhs
     SWIFT_SDK_${prefix}_MODULE_ARCHITECTURES)     # result
 
+  # Determine whether this is a simulator SDK.
+  if ( ${xcrun_name} MATCHES "simulator" )
+    set(SWIFT_SDK_${prefix}_IS_SIMULATOR TRUE)
+  else()
+    set(SWIFT_SDK_${prefix}_IS_SIMULATOR FALSE)
+  endif()
+
   # Configure variables for _all_ architectures even if we aren't "building"
   # them because they aren't supported.
   foreach(arch ${architectures})
@@ -181,6 +190,12 @@ macro(configure_sdk_darwin
     set(SWIFT_SDK_${prefix}_ARCH_${arch}_TRIPLE
         "${arch}-apple-${SWIFT_SDK_${prefix}_TRIPLE_NAME}")
 
+    # If this is a simulator target, append -simulator.
+    if (SWIFT_SDK_${prefix}_IS_SIMULATOR)
+      set(SWIFT_SDK_${prefix}_ARCH_${arch}_TRIPLE
+          "${SWIFT_SDK_${prefix}_ARCH_${arch}_TRIPLE}-simulator")
+    endif ()
+
     if(SWIFT_ENABLE_MACCATALYST AND "${prefix}" STREQUAL "OSX")
       # For macCatalyst append the '-macabi' environment to the target triple.
       set(SWIFT_SDK_MACCATALYST_ARCH_${arch}_TRIPLE

cmake/modules/macCatalystUtils.cmake

@@ -35,6 +35,19 @@ function(get_maccatalyst_build_flavor out_var sdk flavor)
   endif()
 endfunction()
 
+# Form a versioned target triple for the given SDK.
+function(get_versioned_target_triple target_out_var sdk arch version)
+  if (SWIFT_SDK_${sdk}_IS_SIMULATOR)
+    # The version goes before the "-simulator".
+    set(target "${SWIFT_SDK_${sdk}_ARCH_${arch}_TRIPLE}")
+    string(REPLACE "-simulator" "" target "${target}")
+    set(target "${target}${version}-simulator")
+  else ()
+    set(target "${SWIFT_SDK_${sdk}_ARCH_${arch}_TRIPLE}${version}")
+  endif()
+
+  set(${target_out_var} "${target}" PARENT_SCOPE)
+endfunction()
 
 # Sets target_out_var to the target triple for the given SDK and maccatalyst flavor.
 # For zippered flavors also sets the target_variant_out_var. For other
@@ -53,7 +66,8 @@ function(get_target_triple target_out_var target_variant_out_var sdk arch)
   set(deployment_version "${TARGET_DEPLOYMENT_VERSION}")
 
   # Default target triple
-  set(target "${SWIFT_SDK_${sdk}_ARCH_${arch}_TRIPLE}${deployment_version}")
+  get_versioned_target_triple(target ${sdk} ${arch} "${deployment_version}")
+
   set(target_variant)
 
   get_maccatalyst_build_flavor(maccatalyst_build_flavor

test/CMakeLists.txt

@@ -194,7 +194,7 @@ foreach(SDK ${SWIFT_SDKS})
     foreach(BUILD_FLAVOR ${build_flavors})
     # Configure variables for this subdirectory.
     set(VARIANT_SUFFIX "-${SWIFT_SDK_${SDK}_LIB_SUBDIR}-${ARCH}")
-    set(VARIANT_TRIPLE "${SWIFT_SDK_${SDK}_ARCH_${ARCH}_TRIPLE}${SWIFT_SDK_${SDK}_DEPLOYMENT_VERSION}")
+    get_versioned_target_triple(VARIANT_TRIPLE ${SDK} ${ARCH} "${SWIFT_SDK_${SDK}_DEPLOYMENT_VERSION}")
     set(VARIANT_SDK "${SWIFT_SDK_${SDK}_ARCH_${ARCH}_PATH}")
     set(DEFAULT_OSX_VARIANT_SUFFIX "")
 

test/lit.cfg

@@ -326,6 +326,8 @@ lit_config.note('Using resource dir: ' + test_resource_dir)
 if run_os == 'ios' and run_vers.endswith('-macabi'):
     run_vers = run_vers[0:-len('-macabi')]
     run_os = 'maccatalyst'
+if run_vers.endswith('-simulator'):
+    run_vers = run_vers[0:-len('-simulator')]
 
 run_ptrsize = '64' if ('64' in run_cpu or run_cpu == "s390x") else '32'
 run_ptrauth = 'ptrauth' if run_cpu == 'arm64e' else 'noptrauth'