Pass in CMake 3.30+ linker flag workaround on the command-line on the CI, not in patches

Author: finagolfin

.github/workflows/sdks.yml

@@ -125,19 +125,21 @@ jobs:
           ANDROID_ARCH=aarch64 BUILD_SWIFT_PM=1 ${TOOLCHAIN}/bin/swift get-packages-and-swift-source.swift
 
           git apply -C1 swift-android.patch swift-android-ci.patch
+          BUILD_FLAG="--foundation-cmake-options=-DCMAKE_SHARED_LINKER_FLAGS=''"
           if ${{ matrix.version == 'release' }}; then
             perl -pi -e 's%r26%ndk/27%' swift/stdlib/cmake/modules/AddSwiftStdlib.cmake
-            BUILD_FLAG="--build-swift-tools=0"
+            BUILD_FLAG+=" --build-swift-tools=0"
             LSP_BUILD="--sourcekit-lsp"
             git apply swift-android-ci-release.patch swift-android-testing-release.patch
           else
             if ${{ matrix.version == 'trunk' }}; then
               git apply swift-android-trunk-libdispatch.patch
+              BUILD_FLAG+=" --libdispatch-cmake-options=-DCMAKE_SHARED_LINKER_FLAGS=''"
             else
               git apply swift-android-ci-devel.patch swift-android-devel.patch
             fi
             git apply -C2 swift-android-ci-except-release.patch
-            BUILD_FLAG="--cross-compile-build-swift-tools=0"
+            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
           fi

swift-android-trunk-libdispatch.patch

@@ -13,15 +13,3 @@ index 016bf294..5c42986a 100644
  endif()
 
  if(dispatch_FOUND)
-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-android.patch

@@ -24,7 +24,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')
 
@@ -44,23 +44,12 @@ 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-corelibs-foundation/Sources/Foundation/CMakeLists.txt b/swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt
 index 016bf294..5c42986a 100644
 --- a/swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt
@@ -91,18 +80,6 @@ index 758dd1df..02970992 100644
          guard var spawnAttrs else {
              throw NSError(domain: NSPOSIXErrorDomain, code: Int(errno),
                            userInfo: [NSURLErrorKey:self.executableURL!])
-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)
 diff --git a/swift-testing/Sources/Testing/CMakeLists.txt b/swift-testing/Sources/Testing/CMakeLists.tx
 index e40cb1b..ff2f920 100644
 --- a/swift-testing/Sources/Testing/CMakeLists.txt