Use command-line flags to work around CMake 3.30+ linker flag bug, rather than patching files

Author: finagolfin

.github/workflows/pull_request.yml

@@ -44,14 +44,6 @@ jobs:
              build-type: 'docker'
              build-compiler: '0'
              runner: 'ubuntu-24.04'
-           - swift-version: 'swift-6.2-branch'
-             build-type: 'docker'
-             build-compiler: '0'
-             runner: 'ubuntu-24.04'
-           - swift-version: 'development'
-             build-type: 'docker'
-             build-compiler: '0'
-             runner: 'ubuntu-24.04'
      runs-on: ${{ matrix.runner }}
      # 15 hour timeout
      timeout-minutes: 900

swift-ci/sdks/android/build-docker

@@ -9,7 +9,7 @@
 # default architectures to build for
 TARGET_ARCHS=${TARGET_ARCHS:-aarch64,x86_64,armv7}
 
-ANDROID_NDK_VERSION=android-ndk-r27c
+ANDROID_NDK_VERSION=android-ndk-r27d
 ANDROID_API=28
 
 BASEPATH=$(dirname $(realpath $0))

swift-ci/sdks/android/build-local

@@ -9,7 +9,7 @@
 # default architectures to build for
 TARGET_ARCHS=${TARGET_ARCHS:-aarch64,x86_64,armv7}
 
-ANDROID_NDK_VERSION=android-ndk-r27c
+ANDROID_NDK_VERSION=android-ndk-r27d
 ANDROID_API=28
 
 BASEPATH=$(dirname $(realpath $0))

swift-ci/sdks/android/patches/apply-patches.sh

@@ -10,7 +10,7 @@ case "${BUILD_SCHEME}" in
         ;;
     development)
         git apply -v -C1 ${patches_dir}/swift-android.patch
-        git apply -v -C1 ${patches_dir}/swift-android-trunk-libdispatch.patch
+        git apply -v -C1 ${patches_dir}/swift-android-trunk.patch
         ;;
     *)
         echo "$0: invalid BUILD_SCHEME=${BUILD_SCHEME}"

swift-ci/sdks/android/patches/swift-android-trunk-libdispatch.patch renamed to swift-ci/sdks/android/patches/swift-android-trunk.patch

@@ -28,15 +28,3 @@ index 9a0f5b43e2d..5c7d1320a2d 100644
 
              toolchain_path = product.native_toolchain_path(args.host_target)
              cmake_swiftc_path = os.getenv('CMAKE_Swift_COMPILER',
-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
-+++ b/swift-corelibs-libdispatch/src/swift/CMakeLists.txt
-@@ -15,6 +15,7 @@ add_library(swiftDispatch
-   Source.swift
-   Time.swift
-   Wrapper.swift)
-+set(CMAKE_SHARED_LINKER_FLAGS "")
- target_compile_options(swiftDispatch PRIVATE
-   "SHELL:-Xcc -fblocks"
-   "SHELL:-Xcc -fmodule-map-file=${PROJECT_SOURCE_DIR}/dispatch/module.modulemap"

swift-ci/sdks/android/patches/swift-android.patch

@@ -36,7 +36,7 @@ index 324d1a77eea..e88601a8701 100644
 
  from . import cmake_product
  from . import product
-@@ -115,6 +117,24 @@ class SwiftTestingCMakeShim(cmake_product.CMakeProduct):
+@@ -115,6 +117,25 @@ class SwiftTestingCMakeShim(cmake_product.CMakeProduct):
          # FIXME: If we build macros for the builder, specify the path.
          self.cmake_options.define('SwiftTesting_MACRO', 'NO')
 
@@ -56,32 +56,9 @@ index 324d1a77eea..e88601a8701 100644
 +            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_SHARED_LINKER_FLAGS', '')
 +            self.cmake_options.define('CMAKE_FIND_ROOT_PATH', self.args.cross_compile_deps_path)
 +
          self.generate_toolchain_file_for_darwin_or_linux(
              host_target, override_macos_deployment_version=override_deployment_version)
          self.build_with_cmake([], self.args.build_variant, [],
-diff --git a/swift-corelibs-foundation/CMakeLists.txt b/swift-corelibs-foundation/CMakeLists.txt
-index 7f290d16..95366592 100644
---- a/swift-corelibs-foundation/CMakeLists.txt
-+++ b/swift-corelibs-foundation/CMakeLists.txt
-@@ -51,6 +51,7 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL Windows)
-     endif()
- endif()
- 
-+set(CMAKE_SHARED_LINKER_FLAGS "")
- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-diff --git a/swift-testing/CMakeLists.txt b/swift-testing/CMakeLists.txt
-index 1be9a4b..bd7b1bd 100644
---- a/swift-testing/CMakeLists.txt
-+++ b/swift-testing/CMakeLists.txt
-@@ -28,6 +28,7 @@ list(APPEND CMAKE_MODULE_PATH
-   ${PROJECT_SOURCE_DIR}/cmake/modules
-   ${PROJECT_SOURCE_DIR}/cmake/modules/shared)
- 
-+set(CMAKE_SHARED_LINKER_FLAGS "")
- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)

swift-ci/sdks/android/scripts/build.sh

@@ -460,6 +460,8 @@ for arch in $archs; do
             --swift-testing --install-swift-testing \
             --cross-compile-build-swift-tools=0 \
             --llvm-ninja-targets-for-cross-compile-hosts=help \
+            --libdispatch-cmake-options=-DCMAKE_SHARED_LINKER_FLAGS= \
+            --foundation-cmake-options=-DCMAKE_SHARED_LINKER_FLAGS= \
             --cross-compile-append-host-target-to-destdir=False 
             # --extra-cmake-options='-DCMAKE_EXTRA_LINK_FLAGS="-Wl,-z,max-page-size=16384"'
         # need to remove symlink that gets created in the NDK to the previous arch's build