diff --git a/.github/workflows/build-toolchain.yml b/.github/workflows/build-toolchain.yml
index e99e149a6..37962a142 100644
--- a/.github/workflows/build-toolchain.yml
+++ b/.github/workflows/build-toolchain.yml
@@ -193,22 +193,8 @@ jobs:
       zlib_revision: ${{ steps.context.outputs.zlib_revision }}
       zlib_version: ${{ steps.context.outputs.zlib_version }}
       ANDROID_API_LEVEL: ${{ steps.context.outputs.ANDROID_API_LEVEL }}
-      WINDOWS_CMAKE_C_FLAGS: ${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}
-      WINDOWS_CMAKE_CXX_FLAGS: ${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}
-      WINDOWS_CMAKE_EXE_LINKER_FLAGS: ${{ steps.context.outputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}
-      WINDOWS_CMAKE_SHARED_LINKER_FLAGS: ${{ steps.context.outputs.WINDOWS_CMAKE_SHARED_LINKER_FLAGS }}
-      DARWIN_CMAKE_C_FLAGS: ${{ steps.context.outputs.DARWIN_CMAKE_C_FLAGS }}
-      DARWIN_CMAKE_CXX_FLAGS: ${{ steps.context.outputs.DARWIN_CMAKE_CXX_FLAGS }}
-      DARWIN_CMAKE_EXE_LINKER_FLAGS: ${{ steps.context.outputs.DARWIN_CMAKE_EXE_LINKER_FLAGS }}
-      DARWIN_CMAKE_SHARED_LINKER_FLAGS: ${{ steps.context.outputs.DARWIN_CMAKE_SHARED_LINKER_FLAGS }}
       ANDROID_CLANG_VERSION: ${{ steps.context.outputs.ANDROID_CLANG_VERSION }}
-      ANDROID_CMAKE_C_FLAGS: ${{ steps.context.outputs.ANDROID_CMAKE_C_FLAGS }}
-      ANDROID_CMAKE_CXX_FLAGS: ${{ steps.context.outputs.ANDROID_CMAKE_CXX_FLAGS }}
-      ANDROID_CMAKE_EXE_LINKER_FLAGS: ${{ steps.context.outputs.ANDROID_CMAKE_EXE_LINKER_FLAGS }}
-      ANDROID_CMAKE_SHARED_LINKER_FLAGS: ${{ steps.context.outputs.ANDROID_CMAKE_SHARED_LINKER_FLAGS }}
       ANDROID_NDK_VERSION: ${{ steps.context.outputs.ANDROID_NDK_VERSION }}
-      WINDOWS_CMAKE_Swift_FLAGS: ${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}
-      DARWIN_CMAKE_Swift_FLAGS: ${{ steps.context.outputs.DARWIN_CMAKE_Swift_FLAGS }}
       debug_info: ${{ steps.context.outputs.debug_info }}
       signed: ${{ steps.context.outputs.signed }}
       swift_version: ${{ steps.context.outputs.swift_version }}
@@ -313,35 +299,9 @@ jobs:
           #  see: https://github.com/actions/runner-images/issues/10004
           if [[ "${{ github.event_name }}" == "schedule" || "${{ inputs.debug_info }}" == "true" ]]; then
             echo debug_info=true >> ${GITHUB_OUTPUT}
-            echo WINDOWS_CMAKE_C_FLAGS="/GS- /Gw /Gy /Oi /Oy /Z7 /Zc:inline /Zc:preprocessor" >> ${GITHUB_OUTPUT}
-            echo WINDOWS_CMAKE_CXX_FLAGS="/GS- /Gw /Gy /Oi /Oy /Z7 /Zc:inline /Zc:preprocessor /Zc:__cplusplus /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR" >> ${GITHUB_OUTPUT}
-            echo DARWIN_CMAKE_C_FLAGS="-g" >> ${GITHUB_OUTPUT}
-            echo DARWIN_CMAKE_CXX_FLAGS="-g" >> ${GITHUB_OUTPUT}
-            echo DARWIN_CMAKE_EXE_LINKER_FLAGS="" >> ${GITHUB_OUTPUT}
-            echo DARWIN_CMAKE_SHARED_LINKER_FLAGS="" >> ${GITHUB_OUTPUT}
-            echo ANDROID_CMAKE_C_FLAGS="-ffunction-sections -fdata-sections -g -gsplit-dwarf" >> ${GITHUB_OUTPUT}
-            echo ANDROID_CMAKE_CXX_FLAGS="-ffunction-sections -fdata-sections -g -gsplit-dwarf" >> ${GITHUB_OUTPUT}
-            echo WINDOWS_CMAKE_EXE_LINKER_FLAGS="-incremental:no -debug -opt:ref -opt:icf" >> ${GITHUB_OUTPUT}
-            echo WINDOWS_CMAKE_SHARED_LINKER_FLAGS="-incremental:no -debug -opt:ref -opt:icf" >> ${GITHUB_OUTPUT}
-            echo WINDOWS_CMAKE_Swift_FLAGS="-g -debug-info-format=codeview -Xlinker -debug -Xlinker -incremental:no -Xlinker -opt:ref -Xlinker -opt:icf" >> ${GITHUB_OUTPUT}
-            echo DARWIN_CMAKE_Swift_FLAGS="-g" >> ${GITHUB_OUTPUT}
           else
             echo debug_info=false >> ${GITHUB_OUTPUT}
-            echo WINDOWS_CMAKE_C_FLAGS="/GS- /Gw /Gy /Oi /Oy /Zc:inline /Zc:preprocessor" >> ${GITHUB_OUTPUT}
-            echo WINDOWS_CMAKE_CXX_FLAGS="/GS- /Gw /Gy /Oi /Oy /Zc:inline /Zc:preprocessor /Zc:__cplusplus /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR" >> ${GITHUB_OUTPUT}
-            echo DARWIN_CMAKE_C_FLAGS="" >> ${GITHUB_OUTPUT}
-            echo DARWIN_CMAKE_CXX_FLAGS="" >> ${GITHUB_OUTPUT}
-            echo DARWIN_CMAKE_EXE_LINKER_FLAGS="" >> ${GITHUB_OUTPUT}
-            echo DARWIN_CMAKE_SHARED_LINKER_FLAGS="" >> ${GITHUB_OUTPUT}
-            echo ANDROID_CMAKE_C_FLAGS="-ffunction-sections -fdata-sections" >> ${GITHUB_OUTPUT}
-            echo ANDROID_CMAKE_CXX_FLAGS="-ffunction-sections -fdata-sections" >> ${GITHUB_OUTPUT}
-            echo WINDOWS_CMAKE_EXE_LINKER_FLAGS="" >> ${GITHUB_OUTPUT}
-            echo WINDOWS_CMAKE_SHARED_LINKER_FLAGS="" >> ${GITHUB_OUTPUT}
-            echo WINDOWS_CMAKE_Swift_FLAGS="-Xlinker -incremental:no -Xlinker -opt:ref -Xlinker -opt:icf" >> ${GITHUB_OUTPUT}
-            echo DARWIN_CMAKE_Swift_FLAGS="" >> ${GITHUB_OUTPUT}
           fi
-          echo ANDROID_CMAKE_EXE_LINKER_FLAGS="" >> ${GITHUB_OUTPUT}
-          echo ANDROID_CMAKE_SHARED_LINKER_FLAGS="" >> ${GITHUB_OUTPUT}
 
           if [[ "${{ github.event_name }}" == "schedule" || "${{ inputs.signed }}" == "true" ]]; then
             # FIXME(compnerd) enable this when requested
@@ -399,28 +359,14 @@ jobs:
                 {
                   "arch": "amd64",
                   "cpu": "x86_64",
-                  "triple": "x86_64-unknown-windows-msvc",
-                  "compiler_target": "x86_64-unknown-windows-msvc",
                   "os": "Windows",
-                  "cc": "cl",
-                  "cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
-                  "cxx": "cl",
-                  "cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
-                  "cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}\" -D CMAKE_SHARED_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_SHARED_LINKER_FLAGS }}\" -D CMAKE_STATIC_LIBRARY_PREFIX_Swift=lib",
-                  "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=AMD64"
+                  "triple": "x86_64-unknown-windows-msvc"
                 },
                 {
                   "arch": "arm64",
                   "cpu": "aarch64",
-                  "triple": "aarch64-unknown-windows-msvc",
-                  "compiler_target": "aarch64-unknown-windows-msvc",
                   "os": "Windows",
-                  "cc": "cl",
-                  "cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
-                  "cxx": "cl",
-                  "cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
-                  "cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}\" -D CMAKE_SHARED_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_SHARED_LINKER_FLAGS }}\" -D CMAKE_STATIC_LIBRARY_PREFIX_Swift=lib",
-                  "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=ARM64"
+                  "triple": "aarch64-unknown-windows-msvc"
                 }
               ]
             }
@@ -430,15 +376,8 @@ jobs:
                 {
                   "arch": "arm64",
                   "cpu": "aarch64",
-                  "triple": "aarch64-unknown-windows-msvc",
-                  "compiler_target": "aarch64-unknown-windows-msvc",
                   "os": "Windows",
-                  "cc": "cl",
-                  "cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
-                  "cxx": "cl",
-                  "cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
-                  "cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}\" -D CMAKE_SHARED_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_SHARED_LINKER_FLAGS }}\" -D CMAKE_STATIC_LIBRARY_PREFIX_Swift=lib",
-                  "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=ARM64"
+                  "triple": "aarch64-unknown-windows-msvc"
                 }
               ]
             }
@@ -448,13 +387,8 @@ jobs:
                 {
                   "arch": "amd64",
                   "cpu": "x86_64",
-                  "compiler_target": "x86_64-unknown-windows-msvc",
                   "os": "Windows",
-                  "cc": "cl",
-                  "cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
-                  "cxx": "cl",
-                  "cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
-                  "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=AMD64"
+                  "triple": "x86_64-unknown-windows-msvc"
                 }
               ]
             }
@@ -464,13 +398,8 @@ jobs:
                 {
                   "arch": "arm64",
                   "cpu": "aarch64",
-                  "compiler_target": "aarch64-unknown-windows-msvc",
                   "os": "Windows",
-                  "cc": "cl",
-                  "cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
-                  "cxx": "cl",
-                  "cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
-                  "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=ARM64"
+                  "triple": "aarch64-unknown-windows-msvc"
                 }
               ]
             }
@@ -481,134 +410,43 @@ jobs:
                   "arch": "amd64",
                   "cpu": "x86_64",
                   "os": "Windows",
-                  "platform": "Windows",
-                  "triple": "x86_64-unknown-windows-msvc",
-                  "triple_no_api_level": "x86_64-unknown-windows-msvc",
-                  "cc": "cl",
-                  "cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
-                  "cxx": "cl",
-                  "cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
-                  "swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
-                  "cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}\" -D CMAKE_SHARED_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}\"",
-                  "cmake_ndk_flags": "",
-                  "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=AMD64",
-                  "sdk_install_dir": "${env:GITHUB_WORKSPACE}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr",
-                  "llvm_cmake_flags": "",
-                  "stdlib_cmake_flags": "-D MSVC_C_ARCHITECTURE_ID=amd64 -D MSVC_CXX_ARCHITECTURE_ID=amd64 -D CMAKE_STATIC_LIBRARY_PREFIX_Swift=lib"
+                  "triple": "x86_64-unknown-windows-msvc"
                 },
                 {
                   "arch": "arm64",
                   "cpu": "aarch64",
                   "os": "Windows",
-                  "platform": "Windows",
-                  "triple": "aarch64-unknown-windows-msvc",
-                  "triple_no_api_level": "aarch64-unknown-windows-msvc",
-                  "cc": "cl",
-                  "cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
-                  "cxx": "cl",
-                  "cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
-                  "swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
-                  "cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}\" -D CMAKE_SHARED_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}\"",
-                  "cmake_ndk_flags": "",
-                  "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=ARM64",
-                  "sdk_install_dir": "${env:GITHUB_WORKSPACE}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr",
-                  "llvm_cmake_flags": "",
-                  "stdlib_cmake_flags": "-D MSVC_C_ARCHITECTURE_ID=arm64 -D MSVC_CXX_ARCHITECTURE_ID=arm64 -D CMAKE_STATIC_LIBRARY_PREFIX_Swift=lib"
+                  "triple": "aarch64-unknown-windows-msvc"
                 },
                 {
                   "arch": "x86",
                   "cpu": "i686",
                   "os": "Windows",
-                  "platform": "Windows",
-                  "triple": "i686-unknown-windows-msvc",
-                  "triple_no_api_level": "i686-unknown-windows-msvc",
-                  "cc": "cl",
-                  "cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
-                  "cxx": "cl",
-                  "cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
-                  "swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
-                  "cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}\" -D CMAKE_SHARED_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}\"",
-                  "cmake_ndk_flags": "",
-                  "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=X86",
-                  "sdk_install_dir": "${env:GITHUB_WORKSPACE}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr",
-                  "llvm_cmake_flags": "",
-                  "stdlib_cmake_flags": "-D MSVC_C_ARCHITECTURE_ID=x86 -D MSVC_CXX_ARCHITECTURE_ID=x86"
+                  "triple": "i686-unknown-windows-msvc"
                 },
                 {
                   "arch": "arm64",
                   "cpu": "aarch64",
                   "os": "Android",
-                  "platform": "Android",
-                  "triple": "aarch64-unknown-linux-android${{ inputs.ANDROID_API_LEVEL }}",
-                  "triple_no_api_level": "aarch64-unknown-linux-android",
-                  "cc": "clang",
-                  "cflags": "${{ steps.context.outputs.ANDROID_CMAKE_C_FLAGS }}",
-                  "cxx": "clang++",
-                  "cxxflags": "${{ steps.context.outputs.ANDROID_CMAKE_CXX_FLAGS }}",
-                  "swiftflags": "-sdk ${NDKPATH}/toolchains/llvm/prebuilt/windows-x86_64/sysroot -Xclang-linker -target -Xclang-linker aarch64-unknown-linux-androideabi${{ inputs.ANDROID_API_LEVEL }} -Xclang-linker --sysroot -Xclang-linker ${NDKPATH}/toolchains/llvm/prebuilt/windows-x86_64/sysroot -Xclang-linker -resource-dir -Xclang-linker ${NDKPATH}/toolchains/llvm/prebuilt/windows-x86_64/lib/clang/${{ steps.context.outputs.ANDROID_CLANG_VERSION }} -L ${env:GITHUB_WORKSPACE}/BinaryCache/swift/lib/swift/android -g",
-                  "cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=\"${{ steps.context.outputs.ANDROID_CMAKE_EXE_LINKER_FLAGS }}\" -D CMAKE_SHARED_LINKER_FLAGS=\"${{ steps.context.outputs.ANDROID_CMAKE_SHARED_LINKER_FLAGS }}\"",
-                  "cmake_ndk_flags": "-D CMAKE_ANDROID_NDK=\"${NDKPATH}\" -D SWIFT_ANDROID_NDK_PATH=\"${NDKPATH}\"",
-                  "extra_flags": "-D CMAKE_ANDROID_API=${{ inputs.ANDROID_API_LEVEL }} -D CMAKE_ANDROID_ARCH_ABI=arm64-v8a",
-                  "sdk_install_dir": "${env:GITHUB_WORKSPACE}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr",
-                  "llvm_cmake_flags": "-D LLVM_HOST_TRIPLE=aarch64-unknown-linux-android${{ inputs.ANDROID_API_LEVEL }}",
-                  "stdlib_cmake_flags": "-D LLVM_ENABLE_LIBCXX=YES -D SWIFT_USE_LINKER=lld -D CMAKE_SYSTEM_PROCESSOR=aarch64"
+                  "triple": "aarch64-unknown-linux-android${{ inputs.ANDROID_API_LEVEL }}"
                 },
                 {
                   "arch": "armv7",
                   "cpu": "armv7",
                   "os": "Android",
-                  "platform": "Android",
-                  "triple": "armv7-unknown-linux-androideabi${{ inputs.ANDROID_API_LEVEL }}",
-                  "triple_no_api_level": "armv7-unknown-linux-androideabi",
-                  "cc": "clang",
-                  "cflags": "${{ steps.context.outputs.ANDROID_CMAKE_C_FLAGS }}",
-                  "cxx": "clang++",
-                  "cxxflags": "${{ steps.context.outputs.ANDROID_CMAKE_CXX_FLAGS }}",
-                  "swiftflags": "-sdk ${NDKPATH}/toolchains/llvm/prebuilt/windows-x86_64/sysroot -Xclang-linker -target -Xclang-linker armv7a-unknown-linux-androideabi${{ inputs.ANDROID_API_LEVEL }} -Xclang-linker --sysroot -Xclang-linker ${NDKPATH}/toolchains/llvm/prebuilt/windows-x86_64/sysroot -Xclang-linker -resource-dir -Xclang-linker ${NDKPATH}/toolchains/llvm/prebuilt/windows-x86_64/lib/clang/${{ steps.context.outputs.ANDROID_CLANG_VERSION }} -L ${env:GITHUB_WORKSPACE}/BinaryCache/swift/lib/swift/android -g",
-                  "cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=\"${{ steps.context.outputs.ANDROID_CMAKE_EXE_LINKER_FLAGS }}\" -D CMAKE_SHARED_LINKER_FLAGS=\"${{ steps.context.outputs.ANDROID_CMAKE_SHARED_LINKER_FLAGS }}\"",
-                  "cmake_ndk_flags": "-D CMAKE_ANDROID_NDK=\"${NDKPATH}\" -D SWIFT_ANDROID_NDK_PATH=\"${NDKPATH}\"",
-                  "extra_flags": "-D CMAKE_ANDROID_API=${{ inputs.ANDROID_API_LEVEL }} -D CMAKE_ANDROID_ARCH_ABI=armeabi-v7a",
-                  "sdk_install_dir": "${env:GITHUB_WORKSPACE}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr",
-                  "llvm_cmake_flags": "-D LLVM_HOST_TRIPLE=armv7a-unknown-linux-androideabi${{ inputs.ANDROID_API_LEVEL }}",
-                  "stdlib_cmake_flags": "-D LLVM_ENABLE_LIBCXX=YES -D SWIFT_USE_LINKER=lld -D CMAKE_SYSTEM_PROCESSOR=armv7-a"
+                  "triple": "armv7-unknown-linux-androideabi${{ inputs.ANDROID_API_LEVEL }}"
                 },
                 {
                   "arch": "i686",
                   "cpu": "i686",
                   "os": "Android",
-                  "platform": "Android",
-                  "triple": "i686-unknown-linux-android${{ inputs.ANDROID_API_LEVEL }}",
-                  "triple_no_api_level": "i686-unknown-linux-android",
-                  "cc": "clang",
-                  "cflags": "${{ steps.context.outputs.ANDROID_CMAKE_C_FLAGS }}",
-                  "cxx": "clang++",
-                  "cxxflags": "${{ steps.context.outputs.ANDROID_CMAKE_CXX_FLAGS }}",
-                  "swiftflags": "-sdk ${NDKPATH}/toolchains/llvm/prebuilt/windows-x86_64/sysroot -Xclang-linker -target -Xclang-linker i686-unknown-linux-androideabi${{ inputs.ANDROID_API_LEVEL }} -Xclang-linker --sysroot -Xclang-linker ${NDKPATH}/toolchains/llvm/prebuilt/windows-x86_64/sysroot -Xclang-linker -resource-dir -Xclang-linker ${NDKPATH}/toolchains/llvm/prebuilt/windows-x86_64/lib/clang/${{ steps.context.outputs.ANDROID_CLANG_VERSION }} -L ${env:GITHUB_WORKSPACE}/BinaryCache/swift/lib/swift/android -g",
-                  "cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=\"${{ steps.context.outputs.ANDROID_CMAKE_EXE_LINKER_FLAGS }}\" -D CMAKE_SHARED_LINKER_FLAGS=\"${{ steps.context.outputs.ANDROID_CMAKE_SHARED_LINKER_FLAGS }}\"",
-                  "cmake_ndk_flags": "-D CMAKE_ANDROID_NDK=\"${NDKPATH}\" -D SWIFT_ANDROID_NDK_PATH=\"${NDKPATH}\"",
-                  "extra_flags": "-D CMAKE_ANDROID_API=${{ inputs.ANDROID_API_LEVEL }} -D CMAKE_ANDROID_ARCH_ABI=x86",
-                  "sdk_install_dir": "${env:GITHUB_WORKSPACE}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr",
-                  "llvm_cmake_flags": "-D LLVM_HOST_TRIPLE=i686-unknown-linux-android${{ inputs.ANDROID_API_LEVEL }}",
-                  "stdlib_cmake_flags": "-D LLVM_ENABLE_LIBCXX=YES -D SWIFT_USE_LINKER=lld -D CMAKE_SYSTEM_PROCESSOR=i686"
+                  "triple": "i686-unknown-linux-android${{ inputs.ANDROID_API_LEVEL }}"
                 },
                 {
                   "arch": "x86_64",
                   "cpu": "x86_64",
                   "os": "Android",
-                  "platform": "Android",
-                  "triple": "x86_64-unknown-linux-android${{ inputs.ANDROID_API_LEVEL }}",
-                  "triple_no_api_level": "x86_64-unknown-linux-android",
-                  "cc": "clang",
-                  "cflags": "${{ steps.context.outputs.ANDROID_CMAKE_C_FLAGS }}",
-                  "cxx": "clang++",
-                  "cxxflags": "${{ steps.context.outputs.ANDROID_CMAKE_CXX_FLAGS }}",
-                  "swiftflags": "-sdk ${NDKPATH}/toolchains/llvm/prebuilt/windows-x86_64/sysroot -Xclang-linker -target -Xclang-linker x86_64-unknown-linux-androideabi${{ inputs.ANDROID_API_LEVEL }} -Xclang-linker --sysroot -Xclang-linker ${NDKPATH}/toolchains/llvm/prebuilt/windows-x86_64/sysroot -Xclang-linker -resource-dir -Xclang-linker ${NDKPATH}/toolchains/llvm/prebuilt/windows-x86_64/lib/clang/${{ steps.context.outputs.ANDROID_CLANG_VERSION }} -L ${env:GITHUB_WORKSPACE}/BinaryCache/swift/lib/swift/android -g",
-                  "cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=\"${{ steps.context.outputs.ANDROID_CMAKE_EXE_LINKER_FLAGS }}\" -D CMAKE_SHARED_LINKER_FLAGS=\"${{ steps.context.outputs.ANDROID_CMAKE_SHARED_LINKER_FLAGS }}\"",
-                  "cmake_ndk_flags": "-D CMAKE_ANDROID_NDK=\"${NDKPATH}\" -D SWIFT_ANDROID_NDK_PATH=\"${NDKPATH}\"",
-                  "extra_flags": "-D CMAKE_ANDROID_API=${{ inputs.ANDROID_API_LEVEL }} -D CMAKE_ANDROID_ARCH_ABI=x86_64",
-                  "sdk_install_dir": "${env:GITHUB_WORKSPACE}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr",
-                  "llvm_cmake_flags": "-D LLVM_HOST_TRIPLE=x86_64-unknown-linux-android${{ inputs.ANDROID_API_LEVEL }}",
-                  "stdlib_cmake_flags": "-D LLVM_ENABLE_LIBCXX=YES -D SWIFT_USE_LINKER=lld -D CMAKE_SYSTEM_PROCESSOR=x86_64"
+                  "triple": "x86_64-unknown-linux-android${{ inputs.ANDROID_API_LEVEL }}"
                 }
               ]
             }
@@ -619,58 +457,19 @@ jobs:
                   "arch": "amd64",
                   "cpu": "x86_64",
                   "os": "Windows",
-                  "platform": "Windows",
-                  "triple": "x86_64-unknown-windows-msvc",
-                  "triple_no_api_level": "x86_64-unknown-windows-msvc",
-                  "cc": "cl",
-                  "cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
-                  "cxx": "cl",
-                  "cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
-                  "swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
-                  "cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}\" -D CMAKE_SHARED_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}\"",
-                  "cmake_ndk_flags": "",
-                  "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=AMD64",
-                  "sdk_install_dir": "${env:GITHUB_WORKSPACE}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr",
-                  "llvm_cmake_flags": "",
-                  "stdlib_cmake_flags": "-D MSVC_C_ARCHITECTURE_ID=amd64 -D MSVC_CXX_ARCHITECTURE_ID=amd64"
+                  "triple": "x86_64-unknown-windows-msvc"
                 },
                 {
                   "arch": "arm64",
                   "cpu": "aarch64",
                   "os": "Windows",
-                  "platform": "Windows",
-                  "triple": "aarch64-unknown-windows-msvc",
-                  "triple_no_api_level": "aarch64-unknown-windows-msvc",
-                  "cc": "cl",
-                  "cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
-                  "cxx": "cl",
-                  "cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
-                  "swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
-                  "cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}\" -D CMAKE_SHARED_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}\"",
-                  "cmake_ndk_flags": "",
-                  "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=ARM64",
-                  "sdk_install_dir": "${env:GITHUB_WORKSPACE}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr",
-                  "llvm_cmake_flags": "",
-                  "stdlib_cmake_flags": "-D MSVC_C_ARCHITECTURE_ID=arm64 -D MSVC_CXX_ARCHITECTURE_ID=arm64"
+                  "triple": "aarch64-unknown-windows-msvc"
                 },
                 {
                   "arch": "x86",
                   "cpu": "i686",
                   "os": "Windows",
-                  "platform": "Windows",
-                  "triple": "i686-unknown-windows-msvc",
-                  "triple_no_api_level": "i686-unknown-windows-msvc",
-                  "cc": "cl",
-                  "cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
-                  "cxx": "cl",
-                  "cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
-                  "swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
-                  "cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}\" -D CMAKE_SHARED_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}\"",
-                  "cmake_ndk_flags": "",
-                  "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=X86",
-                  "sdk_install_dir": "${env:GITHUB_WORKSPACE}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr",
-                  "llvm_cmake_flags": "",
-                  "stdlib_cmake_flags": "-D MSVC_C_ARCHITECTURE_ID=x86 -D MSVC_CXX_ARCHITECTURE_ID=x86"
+                  "triple": "i686-unknown-windows-msvc"
                 }
               ]
             }
@@ -680,24 +479,12 @@ jobs:
                 {
                   "arch": "x86_64",
                   "cpu": "x86_64",
-                  "os": "Darwin",
-                  "cc": "clang",
-                  "cflags": "${{ steps.context.outputs.DARWIN_CMAKE_C_FLAGS }}",
-                  "cxx": "clang++",
-                  "cxxflags": "${{ steps.context.outputs.DARWIN_CMAKE_CXX_FLAGS }}",
-                  "cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=\"${{ steps.context.outputs.DARWIN_CMAKE_EXE_LINKER_FLAGS }}\" -D CMAKE_SHARED_LINKER_FLAGS=\"${{ steps.context.outputs.DARWIN_CMAKE_SHARED_LINKER_FLAGS }}\"",
-                  "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=x86_64 -D CMAKE_OSX_DEPLOYMENT_TARGET=15.0 -D CMAKE_OSX_ARCHITECTURES=x86_64"
+                  "os": "Darwin"
                 },
                 {
                   "arch": "arm64",
                   "cpu": "arm64",
-                  "os": "Darwin",
-                  "cc": "clang",
-                  "cflags": "${{ steps.context.outputs.DARWIN_CMAKE_C_FLAGS }}",
-                  "cxx": "clang++",
-                  "cxxflags": "${{ steps.context.outputs.DARWIN_CMAKE_CXX_FLAGS }}",
-                  "cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=${{ steps.context.outputs.DARWIN_CMAKE_EXE_LINKER_FLAGS }} -D CMAKE_SHARED_LINKER_FLAGS=${{ steps.context.outputs.DARWIN_CMAKE_SHARED_LINKER_FLAGS }}",
-                  "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=arm64 -D CMAKE_OSX_DEPLOYMENT_TARGET=15.0 -D CMAKE_OSX_ARCHITECTURES=arm64"
+                  "os": "Darwin"
                 }
               ]
             }
@@ -707,13 +494,8 @@ jobs:
                 {
                   "arch": "arm64",
                   "cpu": "arm64",
-                  "compiler_target": "arm64-apple-macosx15.0",
                   "os": "Darwin",
-                  "cc": "clang",
-                  "cflags": "${{ steps.context.outputs.DARWIN_CMAKE_C_FLAGS }}",
-                  "cxx": "clang++",
-                  "cxxflags": "${{ steps.context.outputs.DARWIN_CMAKE_CXX_FLAGS }}",
-                  "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=arm64 -D CMAKE_OSX_DEPLOYMENT_TARGET=15.0 -D CMAKE_OSX_ARCHITECTURES=arm64"
+                  "triple": "arm64-apple-macosx15.0"
                 }
               ]
             }
@@ -724,39 +506,13 @@ jobs:
                   "arch": "x86_64",
                   "cpu": "x86_64",
                   "os": "Darwin",
-                  "platform": "MacOSX",
-                  "triple": "x86_64-apple-macosx15.0",
-                  "triple_no_api_level": "x86_64-apple-macosx15.0",
-                  "cc": "clang",
-                  "cflags": "${{ steps.context.outputs.DARWIN_CMAKE_C_FLAGS }}",
-                  "cxx": "clang++",
-                  "cxxflags": "${{ steps.context.outputs.DARWIN_CMAKE_CXX_FLAGS }}",
-                  "swiftflags": "${{ steps.context.outputs.DARWIN_CMAKE_Swift_FLAGS }}",
-                  "cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=\"${{ steps.context.outputs.DARWIN_CMAKE_EXE_LINKER_FLAGS }}\" -D CMAKE_SHARED_LINKER_FLAGS=\"${{ steps.context.outputs.DARWIN_CMAKE_SHARED_LINKER_FLAGS }}\"",
-                  "cmake_ndk_flags": "",
-                  "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=x86_64 -D CMAKE_OSX_DEPLOYMENT_TARGET=15.0 -D CMAKE_OSX_ARCHITECTURES=x86_64",
-                  "sdk_install_dir": "${env:GITHUB_WORKSPACE}/BuildRoot/Library/Developer/Toolchains/${{ steps.context.outputs.swift_version }}+Asserts/usr",
-                  "llvm_cmake_flags": "",
-                  "stdlib_cmake_flags": ""
+                  "triple": "x86_64-apple-macosx15.0"
                 },
                 {
                   "arch": "arm64",
                   "cpu": "arm64",
                   "os": "Darwin",
-                  "platform": "MacOSX",
-                  "triple": "arm64-apple-macosx15.0",
-                  "triple_no_api_level": "arm64-apple-macosx15.0",
-                  "cc": "clang",
-                  "cflags": "${{ steps.context.outputs.DARWIN_CMAKE_C_FLAGS }}",
-                  "cxx": "clang++",
-                  "cxxflags": "${{ steps.context.outputs.DARWIN_CMAKE_CXX_FLAGS }}",
-                  "swiftflags": "${{ steps.context.outputs.DARWIN_CMAKE_Swift_FLAGS }}",
-                  "cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=\"${{ steps.context.outputs.DARWIN_CMAKE_EXE_LINKER_FLAGS }}\" -D CMAKE_SHARED_LINKER_FLAGS=\"${{ steps.context.outputs.DARWIN_CMAKE_SHARED_LINKER_FLAGS }}\"",
-                  "cmake_ndk_flags": "",
-                  "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=arm64 -D CMAKE_OSX_DEPLOYMENT_TARGET=15.0 -D CMAKE_OSX_ARCHITECTURES=arm64",
-                  "sdk_install_dir": "${env:GITHUB_WORKSPACE}/BuildRoot/Library/Developer/Toolchains/${{ steps.context.outputs.swift_version }}+Asserts/usr",
-                  "llvm_cmake_flags": "",
-                  "stdlib_cmake_flags": ""
+                  "triple": "arm64-apple-macosx15.0"
                 }
               ]
             }
@@ -847,17 +603,8 @@ jobs:
       zlib_revision: ${{ needs.context.outputs.zlib_revision }}
       zlib_version: ${{ needs.context.outputs.zlib_version }}
       ANDROID_API_LEVEL: ${{ needs.context.outputs.ANDROID_API_LEVEL }}
-      WINDOWS_CMAKE_C_FLAGS: ${{ needs.context.outputs.WINDOWS_CMAKE_C_FLAGS }}
-      WINDOWS_CMAKE_CXX_FLAGS: ${{ needs.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}
-      WINDOWS_CMAKE_EXE_LINKER_FLAGS: ${{ needs.context.outputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}
-      WINDOWS_CMAKE_SHARED_LINKER_FLAGS: ${{ needs.context.outputs.WINDOWS_CMAKE_SHARED_LINKER_FLAGS }}
       ANDROID_CLANG_VERSION: ${{ needs.context.outputs.ANDROID_CLANG_VERSION }}
-      ANDROID_CMAKE_C_FLAGS: ${{ needs.context.outputs.ANDROID_CMAKE_C_FLAGS }}
-      ANDROID_CMAKE_CXX_FLAGS: ${{ needs.context.outputs.ANDROID_CMAKE_CXX_FLAGS }}
-      ANDROID_CMAKE_EXE_LINKER_FLAGS: ${{ needs.context.outputs.ANDROID_CMAKE_EXE_LINKER_FLAGS }}
-      ANDROID_CMAKE_SHARED_LINKER_FLAGS: ${{ needs.context.outputs.ANDROID_CMAKE_SHARED_LINKER_FLAGS }}
       ANDROID_NDK_VERSION: ${{ needs.context.outputs.ANDROID_NDK_VERSION }}
-      CMAKE_Swift_FLAGS: ${{ needs.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}
       debug_info: ${{ fromJSON(needs.context.outputs.debug_info) }}
       release: ${{ inputs.create_release }}
       signed: ${{ fromJSON(needs.context.outputs.signed) }}
@@ -932,17 +679,8 @@ jobs:
       zlib_revision: ${{ needs.context.outputs.zlib_revision }}
       zlib_version: ${{ needs.context.outputs.zlib_version }}
       ANDROID_API_LEVEL: ${{ needs.context.outputs.ANDROID_API_LEVEL }}
-      WINDOWS_CMAKE_C_FLAGS: ${{ needs.context.outputs.WINDOWS_CMAKE_C_FLAGS }}
-      WINDOWS_CMAKE_CXX_FLAGS: ${{ needs.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}
-      WINDOWS_CMAKE_EXE_LINKER_FLAGS: ${{ needs.context.outputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}
-      WINDOWS_CMAKE_SHARED_LINKER_FLAGS: ${{ needs.context.outputs.WINDOWS_CMAKE_SHARED_LINKER_FLAGS }}
       ANDROID_CLANG_VERSION: ${{ needs.context.outputs.ANDROID_CLANG_VERSION }}
-      ANDROID_CMAKE_C_FLAGS: ${{ needs.context.outputs.ANDROID_CMAKE_C_FLAGS }}
-      ANDROID_CMAKE_CXX_FLAGS: ${{ needs.context.outputs.ANDROID_CMAKE_CXX_FLAGS }}
-      ANDROID_CMAKE_EXE_LINKER_FLAGS: ${{ needs.context.outputs.ANDROID_CMAKE_EXE_LINKER_FLAGS }}
-      ANDROID_CMAKE_SHARED_LINKER_FLAGS: ${{ needs.context.outputs.ANDROID_CMAKE_SHARED_LINKER_FLAGS }}
       ANDROID_NDK_VERSION: ${{ needs.context.outputs.ANDROID_NDK_VERSION }}
-      CMAKE_Swift_FLAGS: ${{ needs.context.outputs.DARWIN_CMAKE_Swift_FLAGS }}
       debug_info: ${{ fromJSON(needs.context.outputs.debug_info) }}
       release: false
       signed: ${{ fromJSON(needs.context.outputs.signed) }}
diff --git a/.github/workflows/swift-toolchain.yml b/.github/workflows/swift-toolchain.yml
index 59a567383..260e05d19 100644
--- a/.github/workflows/swift-toolchain.yml
+++ b/.github/workflows/swift-toolchain.yml
@@ -203,42 +203,6 @@ on:
         required: true
         type: string
 
-      WINDOWS_CMAKE_C_FLAGS:
-        required: true
-        type: string
-
-      WINDOWS_CMAKE_CXX_FLAGS:
-        required: true
-        type: string
-
-      WINDOWS_CMAKE_EXE_LINKER_FLAGS:
-        required: true
-        type: string
-
-      WINDOWS_CMAKE_SHARED_LINKER_FLAGS:
-        required: true
-        type: string
-
-      ANDROID_CMAKE_C_FLAGS:
-        required: true
-        type: string
-
-      ANDROID_CMAKE_CXX_FLAGS:
-        required: true
-        type: string
-
-      ANDROID_CMAKE_EXE_LINKER_FLAGS:
-        required: true
-        type: string
-
-      ANDROID_CMAKE_SHARED_LINKER_FLAGS:
-        required: true
-        type: string
-
-      CMAKE_Swift_FLAGS:
-        required: true
-        type: string
-
       debug_info:
         required: true
         type: boolean
@@ -880,7 +844,7 @@ jobs:
             --configuration release `
             --package-path ${{ github.workspace }}/SourceCache/swift-driver `
             --build-path ${{ github.workspace }}/BinaryCache/swift-driver `
-            --triple ${{ matrix.compiler_target }} `
+            --triple ${{ matrix.triple }} `
             @ExtraFlags
 
       - name: Copy binaries
@@ -1750,7 +1714,7 @@ jobs:
           android-clang-version: ${{ inputs.ANDROID_CLANG_VERSION }}
           ndk-path: ${{ steps.setup-ndk.outputs.ndk-path }}
           built-compilers: '@("C", "CXX", "Swift")'
-          cache-script: ${{ github.workspace }}/SourceCache/swift/cmake/caches/Runtime-${{ matrix.platform }}-${{ matrix.cpu }}.cmake
+          cache-script: ${{ github.workspace }}/SourceCache/swift/cmake/caches/Runtime-${{ matrix.os == 'Darwin' && 'MacOSX' || matrix.os }}-${{ matrix.cpu }}.cmake
           cmake-defines: |
             @{
               'LLVM_DIR' = "${{ github.workspace }}/BinaryCache/llvm/lib/cmake/llvm";