Update main snapshot to 2025-07-23

Author: kateinoigakukun

README.md

@@ -14,7 +14,7 @@ $ ./tools/build/install-build-sdk.sh main
 # Checkout the Swift repositories in the parent directory (swiftwasm-source) and apply patches
 $ ./tools/git-swift-workspace --scheme main
 # Build the toolchain (this will take a while)
-$ ./tools/build/build-toolchain.sh main
+$ ./tools/build/build-toolchain main
 ```
 
 See [SwiftWasm book](https://book.swiftwasm.org/contribution-guide/how-to-build-toolchain.html) for more details about dependencies you need to install and how to build on Docker.

docs/upstreaming.md

@@ -65,13 +65,7 @@ If it's first time to build or patch files are changed, you need to checkout the
 If you want to build the whole toolchain, run the following command:
 
 ```
-./tools/build/build-toolchain.sh
-```
-
-If you already built the compiler and want to build only the standard library for WebAssembly, run the following command:
-
-```
-./tools/build/build-toolchain.sh --skip-build-host-toolchain
+./tools/build/build-toolchain --scheme main
 ```
 
 ### Edit

schemes/main/build/build-target-toolchain.sh

@@ -137,19 +137,22 @@ main() {
 
   # NOTE: The llvm-cmake-options is a workaround for the issue on amazonlinux2
   # See https://github.com/apple/swift/commit/40c7268e8f7d402b27e3ad16a84180e07c37f92c
-  "$SOURCE_PATH/swift/utils/build-script" \
+  # NOTE: Add llvm-bin directory to PATH so that wasmstdlib.py can find FileCheck during tests
+  env PATH="$OPTIONS_LLVM_BIN:$OPTIONS_SWIFT_BIN:$PATH" "$SOURCE_PATH/swift/utils/build-script" \
     --build-subdir=WebAssembly \
     --release \
     --skip-build-llvm \
     --skip-build-swift \
     --skip-build-cmark \
     --skip-build-benchmarks \
     --skip-early-swift-driver \
+    --wasmkit \
     --build-wasm-stdlib \
     --skip-test-wasm-stdlib \
     --native-swift-tools-path="$OPTIONS_SWIFT_BIN" \
     --native-clang-tools-path="$OPTIONS_CLANG_BIN" \
     --native-llvm-tools-path="$OPTIONS_LLVM_BIN" \
+    --build-runtime-with-host-compiler \
     --extra-cmake-options="\
       -DSWIFT_STDLIB_TRACING=NO \
       -DSWIFT_STDLIB_HAS_ASL=NO \

schemes/main/manifest.json

@@ -1,5 +1,5 @@
 {
-  "base-tag": "swift-DEVELOPMENT-SNAPSHOT-2025-07-18-a",
+  "base-tag": "swift-DEVELOPMENT-SNAPSHOT-2025-07-23-a",
   "icu4c": [],
   "libxml2": [
     "https://github.com/swiftwasm/libxml2-wasm/releases/download/2.0.0/libxml2-wasm32-unknown-wasi.tar.gz",

tools/build/build-toolchain

@@ -0,0 +1,50 @@
+#!/usr/bin/env python3
+
+import sys
+import argparse
+import pathlib
+import subprocess
+from build_support.actions import derive_options_from_args, REPO_ROOT, DownloadBaseSnapshotAction
+
+
+def main():
+    parser = argparse.ArgumentParser(description='Build the Swift toolchain')
+    options = derive_options_from_args(sys.argv[1:], parser)
+
+    # Calculate paths
+    repo_path = pathlib.Path(REPO_ROOT)
+    source_path = repo_path.parent
+    tools_build_path = pathlib.Path(__file__).parent
+
+    build_dir = source_path / "build"
+    cross_compiler_destdir = pathlib.Path(DownloadBaseSnapshotAction.toolchain_path(options))
+
+    # Install base toolchain
+    print("=====> Installing base toolchain")
+    subprocess.check_call([
+        str(tools_build_path / "install-base-toolchain"),
+        "--scheme", options.scheme
+    ])
+
+    # Build LLVM tools
+    print("=====> Building LLVM tools")
+    subprocess.check_call([
+        str(tools_build_path / "build-llvm-tools"),
+        "--toolchain", str(cross_compiler_destdir)
+    ])
+
+    # Build target toolchain
+    print("=====> Building target toolchain")
+    scheme_build_script = repo_path / "schemes" / options.scheme / "build" / "build-target-toolchain.sh"
+
+    subprocess.check_call([
+        str(scheme_build_script),
+        "--llvm-bin", str(build_dir / "llvm-tools" / "bin"),
+        "--clang-bin", str(cross_compiler_destdir / "usr" / "bin"),
+        "--swift-bin", str(cross_compiler_destdir / "usr" / "bin"),
+        "--scheme", options.scheme
+    ])
+
+
+if __name__ == '__main__':
+    main()

tools/build/build-toolchain.sh

@@ -114,16 +114,25 @@ def run(self):
             self.system('git', '-C', f'../{repo}', 'checkout', rev)
 
 class DownloadBaseSnapshotAction(Action):
+
+    @staticmethod
+    def toolchains_dir():
+        return os.path.join(REPO_ROOT, '..', 'build', 'Packaging', 'base-toolchain')
+
+    @staticmethod
+    def toolchain_path(options):
+        return os.path.join(DownloadBaseSnapshotAction.toolchains_dir(), options.tag)
+
     def run(self):
         platform_info = platform.PlatformInfo.derive()
         snapshot_url, tarball_name = platform_info.snapshot_url(self.options.swift_org_download_channel, self.options.tag)
         extension = platform_info.package_extension
 
-        tarball_path = os.path.join('..', 'build', 'Packaging', f'base-snapshot.{extension}')
-        base_snapshot_dir = os.path.join('..', 'build', 'Packaging', 'base-snapshot')
+        base_toolchain_dir = DownloadBaseSnapshotAction.toolchain_path(self.options)
+        tarball_path = os.path.join(os.path.dirname(base_toolchain_dir), tarball_name)
 
-        if os.path.exists(os.path.join(base_snapshot_dir, 'usr')):
-            print(f"=====> Base snapshot '{base_snapshot_dir}' already exists")
+        if os.path.exists(os.path.join(base_toolchain_dir, 'usr')):
+            print(f"=====> Base snapshot '{base_toolchain_dir}' already exists")
             return
 
         if not os.path.exists(tarball_path):
@@ -132,15 +141,15 @@ def run(self):
             self.system('curl', '--fail', '-L', '-o', tarball_path, snapshot_url)
 
         print(f"=====> Unpacking base snapshot {tarball_name}")
-        os.makedirs(base_snapshot_dir, exist_ok=True)
+        os.makedirs(base_toolchain_dir, exist_ok=True)
         if extension == "tar.gz":
-            self.system('tar', '-C', base_snapshot_dir, '--strip-components', '1', '-xzf', tarball_path)
+            self.system('tar', '-C', base_toolchain_dir, '--strip-components', '1', '-xzf', tarball_path)
         elif extension == "pkg":
             import tempfile
             with tempfile.TemporaryDirectory() as tmpdir:
                 self.system('xar', '-xf', tarball_path, '-C', tmpdir)
                 old_cwd = os.getcwd()
-                os.chdir(base_snapshot_dir)
+                os.chdir(base_toolchain_dir)
                 pkg_name = tarball_name.replace(".pkg", "-package.pkg")
                 self.system('cpio', '-i', '-I', os.path.join(tmpdir, pkg_name, 'Payload'))
                 os.chdir(old_cwd)

tools/build/build_support/actions.py

@@ -8,4 +8,5 @@
     # These tools are used by Swift test suite
     'llvm-nm',
     'FileCheck',
-]
+    'split-file',
+]

tools/build/build_support/llvm_tools.py

@@ -34,6 +34,6 @@ install_sccache_if_needed() {
 install_sccache_if_needed
 export PATH="$SCCACHE_INSTALL_PATH:$PATH"
 
-$TOOLS_BUILD_PATH/build-toolchain.sh "$SCHEME"
+$TOOLS_BUILD_PATH/build-toolchain --scheme "$SCHEME"
 
 $TOOLS_BUILD_PATH/package-toolchain --scheme "$SCHEME" --daily-snapshot