Set CMAKE_Swift_COMPILER_TARGET flag centrally and bump build on CI

Author: finagolfin

.github/workflows/sdks.yml

@@ -31,7 +31,7 @@ jobs:
             SWIFT_TAG="swift-DEVELOPMENT-SNAPSHOT-${LATEST_TOOLCHAIN_VERSION}-a"
           fi
           echo "tag=$SWIFT_TAG" >> $GITHUB_OUTPUT
-          echo "key=$SWIFT_TAG-ndk-${NDK_VERSION}-bt-bundle" >> $GITHUB_OUTPUT
+          echo "key=$SWIFT_TAG-ndk-${NDK_VERSION}-get-bundle" >> $GITHUB_OUTPUT
       - name: Get cached SDK bundle
         id: cache-bundle
         uses: actions/cache/restore@v4
@@ -136,7 +136,7 @@ jobs:
             else
               git apply swift-android-ci-devel.patch
             fi
-            git apply -C2 swift-android-ci-except-release.patch swift-android-testing-except-release.patch
+            git apply -C2 swift-android-ci-except-release.patch
             BUILD_FLAG="--cross-compile-build-swift-tools=0"
             SDK_NAME=$(ls | grep swift-${{ matrix.version }}-android-aarch64)
             perl -pi -e 's%33%24%' $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/execinfo.h

swift-android-testing-except-release.patch

@@ -44,18 +44,3 @@ index 90f4aa78..0429425b 100644
    // Glibc versions prior to 2.29 don't support posix_spawn_file_actions_addchdir_np, impacting:
    //  - Amazon Linux 2 (EoL mid-2025)
    return ENOSYS;
-diff --git a/swift-testing/cmake/modules/SwiftModuleInstallation.cmake b/swift-testing/cmake/modules/SwiftModuleInstallation.cmake
-index 1553725..d9f9e5b 100644
---- a/swift-testing/cmake/modules/SwiftModuleInstallation.cmake
-+++ b/swift-testing/cmake/modules/SwiftModuleInstallation.cmake
-@@ -75,6 +75,10 @@ function(_swift_testing_install_target module)
-     set(module_triple_command "${CMAKE_Swift_COMPILER}" -print-target-info)
-     if(CMAKE_Swift_COMPILER_TARGET)
-       list(APPEND module_triple_command -target ${CMAKE_Swift_COMPILER_TARGET})
-+    else()
-+      set(arg_list ${CMAKE_Swift_FLAGS})
-+      separate_arguments(arg_list)
-+      list(APPEND module_triple_command ${arg_list})
-     endif()
-     execute_process(COMMAND ${module_triple_command} OUTPUT_VARIABLE target_info_json)
-     string(JSON module_triple GET "${target_info_json}" "target" "moduleTriple")

swift-android-testing-release.patch

@@ -1,18 +1,3 @@
-diff --git a/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake b/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake
-index 3da519e..e2dd8ed 100644
---- a/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake
-+++ b/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake
-@@ -4,6 +4,10 @@ if(NOT dispatch_MODULE_TRIPLE)
-   set(module_triple_command "${CMAKE_Swift_COMPILER}" -print-target-info)
-   if(CMAKE_Swift_COMPILER_TARGET)
-     list(APPEND module_triple_command -target ${CMAKE_Swift_COMPILER_TARGET})
-+  else()
-+    set(arg_list ${CMAKE_Swift_FLAGS})
-+    separate_arguments(arg_list)
-+    list(APPEND module_triple_command ${arg_list})
-   endif()
-   execute_process(COMMAND ${module_triple_command} OUTPUT_VARIABLE target_info_json)
- 
 diff --git a/swift-corelibs-libdispatch/src/swift/CMakeLists.txt b/swift-corelibs-libdispatch/src/swift/CMakeLists.txt
 index 38bef37..d0ddf98 100644
 --- a/swift-corelibs-libdispatch/src/swift/CMakeLists.txt

swift-android-trunk-libdispatch.patch

@@ -2,6 +2,16 @@ diff --git a/swift/utils/build-script-impl b/swift/utils/build-script-impl
 index 16e05052609..7ab8cebfab8 100755
 --- a/swift/utils/build-script-impl
 +++ b/swift/utils/build-script-impl
+@@ -828,6 +828,9 @@ function set_build_options_for_host() {
+     # and it must be the same for both LLVM and Swift
+ 
+     if [[ "${SWIFT_HOST_TRIPLE}" ]] ; then
++        SWIFT_TARGET_CMAKE_OPTIONS+=(
++            -DCMAKE_Swift_COMPILER_TARGET:STRING="${SWIFT_HOST_TRIPLE}"
++        )
+         llvm_cmake_options+=(
+             -DLLVM_HOST_TRIPLE:STRING="${SWIFT_HOST_TRIPLE}"
+         )
 @@ -2622,6 +2622,7 @@ for host in "${ALL_HOSTS[@]}"; do
                      echo "Cleaning the libdispatch build directory"
                      call rm -rf "${LIBDISPATCH_BUILD_DIR}"
@@ -24,15 +34,16 @@ index 324d1a77eea..e88601a8701 100644
 
  from . import cmake_product
  from . import product
-@@ -115,6 +117,22 @@ class SwiftTestingCMakeShim(cmake_product.CMakeProduct):
+@@ -115,6 +117,24 @@ class SwiftTestingCMakeShim(cmake_product.CMakeProduct):
          # FIXME: If we build macros for the builder, specify the path.
          self.cmake_options.define('SwiftTesting_MACRO', 'NO')
 
 +        if host_target.startswith('android') and self.is_cross_compile_target(host_target):
 +            host_config = HostSpecificConfiguration(host_target, self.args)
 +            self.cmake_options.extend(host_config.cmake_options)
-+            flags = '-target %s-unknown-linux-android%s ' % (self.args.android_arch,
-+                                                             self.args.android_api_level)
++            triple = '%s-unknown-linux-android%s' % (self.args.android_arch,
++                                                     self.args.android_api_level)
++            flags = '-target %s ' % (triple)
 +
 +            flags += '-resource-dir %s/lib/swift ' % (
 +                     self.host_install_destdir(host_target) + self.args.install_prefix)
@@ -41,6 +52,7 @@ index 324d1a77eea..e88601a8701 100644
 +            flags += '-sdk %s/sysroot ' % (ndk_path)
 +            flags += '-tools-directory %s/bin' % (ndk_path)
 +            self.cmake_options.define('CMAKE_Swift_FLAGS', flags)
++            self.cmake_options.define('CMAKE_Swift_COMPILER_TARGET', triple)
 +            self.cmake_options.define('CMAKE_CXX_COMPILER_WORKS', 'True')
 +            self.cmake_options.define('CMAKE_FIND_ROOT_PATH', self.args.cross_compile_deps_path)
 +
@@ -100,21 +112,6 @@ index 758dd1df..02970992 100644
          guard var spawnAttrs else {
              throw NSError(domain: NSPOSIXErrorDomain, code: Int(errno),
                            userInfo: [NSURLErrorKey:self.executableURL!])
-diff --git a/swift-foundation/cmake/modules/SwiftFoundationSwiftSupport.cmake b/swift-foundation/cmake/modules/SwiftFoundationSwiftSupport.cmake
-index cbdfc2a..bb4121d 100644
---- a/swift-foundation/cmake/modules/SwiftFoundationSwiftSupport.cmake
-+++ b/swift-foundation/cmake/modules/SwiftFoundationSwiftSupport.cmake
-@@ -37,6 +37,10 @@ function(_swift_foundation_install_target module)
-     set(module_triple_command "${CMAKE_Swift_COMPILER}" -print-target-info)
-     if(CMAKE_Swift_COMPILER_TARGET)
-       list(APPEND module_triple_command -target ${CMAKE_Swift_COMPILER_TARGET})
-+    else()
-+      set(arg_list ${CMAKE_Swift_FLAGS})
-+      separate_arguments(arg_list)
-+      list(APPEND module_triple_command ${arg_list})
-     endif()
-     execute_process(COMMAND ${module_triple_command} OUTPUT_VARIABLE target_info_json)
-     string(JSON module_triple GET "${target_info_json}" "target" "moduleTriple")
 diff --git a/swift-testing/CMakeLists.txt b/swift-testing/CMakeLists.txt
 index 1be9a4b..bd7b1bd 100644
 --- a/swift-testing/CMakeLists.txt
@@ -143,18 +140,3 @@ index e40cb1b..ff2f920 100644
    endif()
    target_link_libraries(Testing PUBLIC
      Foundation)
-diff --git a/swift-testing/cmake/modules/TargetTriple.cmake b/swift-testing/cmake/modules/TargetTriple.cmake
-index e087cc4..02f3a95 100644
---- a/swift-testing/cmake/modules/TargetTriple.cmake
-+++ b/swift-testing/cmake/modules/TargetTriple.cmake
-@@ -10,6 +10,10 @@
- set(SWT_TARGET_INFO_COMMAND "${CMAKE_Swift_COMPILER}" -print-target-info)
- if(CMAKE_Swift_COMPILER_TARGET)
-   list(APPEND SWT_TARGET_INFO_COMMAND -target ${CMAKE_Swift_COMPILER_TARGET})
-+else()
-+      set(arg_list ${CMAKE_Swift_FLAGS})
-+      separate_arguments(arg_list)
-+      list(APPEND SWT_TARGET_INFO_COMMAND ${arg_list})
- endif()
- execute_process(COMMAND ${SWT_TARGET_INFO_COMMAND} OUTPUT_VARIABLE SWT_TARGET_INFO_JSON)
- string(JSON SWT_TARGET_TRIPLE GET "${SWT_TARGET_INFO_JSON}" "target" "unversionedTriple")