From 764ea1871abe9830b87d8dda09936fa2c4a4c8c5 Mon Sep 17 00:00:00 2001 From: Ruri <888mfvjygb@privaterelay.appleid.com> Date: Wed, 22 Jul 2026 16:32:41 +0800 Subject: [PATCH 1/6] Update workflow to create LLVM.xcframework archive --- .github/workflows/main.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6b0b0ffe..9c18f5a9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,16 +22,18 @@ jobs: timeout-minutes: 1200 steps: - uses: actions/checkout@v3 + with: + submodules: true - run: | make all - - name: create CoreCompiler framework archive - run: tar -cJf CoreCompiler.framework.tar.xz CoreCompiler.framework + - name: create LLVM.xcframework archive + run: tar -cJf LLVM.xcframework.tar.xz LLVM.xcframework - name: create CoreCompilerSupportLibs archive run: tar -cJf CoreCompilerSupportLibs.tar.xz CoreCompilerSupportLibs - uses: actions/upload-artifact@v4 with: - name: CoreCompiler.framework - path: CoreCompiler.framework.tar.xz + name: LLVM.xcframework + path: LLVM.xcframework.tar.xz - uses: actions/upload-artifact@v4 with: name: CoreCompilerSupportLibs From 4513f8de0913f0df279b6aefea00d5a461ec75bf Mon Sep 17 00:00:00 2001 From: Ruri <888mfvjygb@privaterelay.appleid.com> Date: Wed, 22 Jul 2026 16:37:19 +0800 Subject: [PATCH 2/6] Refactor Swift toolchain build process in Makefile Removed the creation of a symbolic link for llvm-macosx-x86_64 and updated the Swift toolchain build command. --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9514b92c..ef3ed63a 100644 --- a/Makefile +++ b/Makefile @@ -25,10 +25,8 @@ swift: perl -i -0pe 's|(// Swift LLVM fork downstream change start\n)(.*?)(// Swift LLVM fork downstream change end\n)|$$1/* NYXIAN: apple lies, lld works fine for MachO\n$$2*/\n$$3|s' \ llvm-project/lld/MachO/InputFiles.cpp -build/LLVMClangSwift_iphoneos/llvm-macosx-x86_64: - mkdir -p build/LLVMClangSwift_iphoneos; cd build/LLVMClangSwift_iphoneos; ln -sfn llvm-macosx-arm64 llvm-macosx-x86_64 -.SwiftToolchain-iphoneos: swift build/LLVMClangSwift_iphoneos/llvm-macosx-x86_64 +.SwiftToolchain-iphoneos: swift $(call log_info,building iOS-native swift toolchain ($(SWIFT_BRANCH))) SWIFT_BRANCH="$(SWIFT_BRANCH)" SWIFT_SOURCE_DIR="$(SWIFT_SOURCE_DIR)" Scripts/build-swift-toolchain.sh build touch .SwiftToolchain-iphoneos From 2c3cf375e4677af2c300acd258a89230a5928603 Mon Sep 17 00:00:00 2001 From: Ruri <888mfvjygb@privaterelay.appleid.com> Date: Wed, 22 Jul 2026 16:40:21 +0800 Subject: [PATCH 3/6] Update build-swift-toolchain.sh --- Scripts/build-swift-toolchain.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Scripts/build-swift-toolchain.sh b/Scripts/build-swift-toolchain.sh index 3e1964cd..7c902f1f 100755 --- a/Scripts/build-swift-toolchain.sh +++ b/Scripts/build-swift-toolchain.sh @@ -165,8 +165,7 @@ copy_ios_install() { local build_dir="${SWIFT_BUILD_ROOT}/${SWIFT_BUILD_SUBDIR}" local install_prefix="Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr" local candidates=( - "${build_dir}/intermediate-install/iphoneos-arm64/${install_prefix}" - "${build_dir}/toolchain-macosx-arm64/${install_prefix}" + "${build_dir}/intermediate-install/iphoneos-arm64/${install_prefix}" ) local swift_build="${build_dir}/swift-iphoneos-arm64" local llvm_build="${build_dir}/llvm-iphoneos-arm64" From 736907a7aa603c2f9f4dab1781b2747bb45fd338 Mon Sep 17 00:00:00 2001 From: Ruri <888mfvjygb@privaterelay.appleid.com> Date: Wed, 22 Jul 2026 16:45:14 +0800 Subject: [PATCH 4/6] Update compiler target for iOS 16.0 --- Scripts/swift-ios-toolchain-presets.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Scripts/swift-ios-toolchain-presets.ini b/Scripts/swift-ios-toolchain-presets.ini index b110ffb1..470a4038 100644 --- a/Scripts/swift-ios-toolchain-presets.ini +++ b/Scripts/swift-ios-toolchain-presets.ini @@ -23,8 +23,8 @@ extra-cmake-options= -DLLVM_ENABLE_ASSERTIONS=OFF -DLLVM_ENABLE_RTTI:BOOL=ON -DLLVM_ENABLE_EH:BOOL=OFF - -DCMAKE_C_COMPILER_TARGET=arm64-apple-darwin - -DCMAKE_CXX_COMPILER_TARGET=arm64-apple-darwin + -DCMAKE_C_COMPILER_TARGET=arm64-apple-ios16.0 + -DCMAKE_CXX_COMPILER_TARGET=arm64-apple-ios16.0 build-toolchain-only=1 build-stdlib-deployment-targets= @@ -43,4 +43,4 @@ swift-include-tests=0 darwin-deployment-version-ios=16.0 darwin-crash-reporter-client=1 llvm-install-components=llvm-ar;llvm-nm;llvm-ranlib;llvm-cov;llvm-profdata;llvm-objdump;llvm-objcopy;llvm-symbolizer;IndexStore;clang;clang-resource-headers;builtins;runtimes;libclang;LTO;clang-features-file;lld -host-target=macosx-arm64 +host-target=iphoneos-arm64 From ee43f91516f02f5f24be851c5308ed8a53659300 Mon Sep 17 00:00:00 2001 From: Ruri <888mfvjygb@privaterelay.appleid.com> Date: Wed, 22 Jul 2026 16:50:04 +0800 Subject: [PATCH 5/6] Add workflow_dispatch trigger to main.yml --- .github/workflows/main.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9c18f5a9..2e4d22a7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,5 +1,8 @@ name: Build LLVM XCFrameworks for Release -on: [push] +on: + push: + workflow_dispatch: + jobs: prepare-build-tools: runs-on: macos-latest From ea871107a466134ba966c5fcb3f6bec2fa21906d Mon Sep 17 00:00:00 2001 From: Ruri <888mfvjygb@privaterelay.appleid.com> Date: Wed, 22 Jul 2026 17:09:24 +0800 Subject: [PATCH 6/6] Change compiler target from iOS to macOS --- Scripts/swift-ios-toolchain-presets.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Scripts/swift-ios-toolchain-presets.ini b/Scripts/swift-ios-toolchain-presets.ini index 470a4038..b110ffb1 100644 --- a/Scripts/swift-ios-toolchain-presets.ini +++ b/Scripts/swift-ios-toolchain-presets.ini @@ -23,8 +23,8 @@ extra-cmake-options= -DLLVM_ENABLE_ASSERTIONS=OFF -DLLVM_ENABLE_RTTI:BOOL=ON -DLLVM_ENABLE_EH:BOOL=OFF - -DCMAKE_C_COMPILER_TARGET=arm64-apple-ios16.0 - -DCMAKE_CXX_COMPILER_TARGET=arm64-apple-ios16.0 + -DCMAKE_C_COMPILER_TARGET=arm64-apple-darwin + -DCMAKE_CXX_COMPILER_TARGET=arm64-apple-darwin build-toolchain-only=1 build-stdlib-deployment-targets= @@ -43,4 +43,4 @@ swift-include-tests=0 darwin-deployment-version-ios=16.0 darwin-crash-reporter-client=1 llvm-install-components=llvm-ar;llvm-nm;llvm-ranlib;llvm-cov;llvm-profdata;llvm-objdump;llvm-objcopy;llvm-symbolizer;IndexStore;clang;clang-resource-headers;builtins;runtimes;libclang;LTO;clang-features-file;lld -host-target=iphoneos-arm64 +host-target=macosx-arm64