Clean up no longer needed Foundation and XCTest build steps

Author: kateinoigakukun

schemes/main/build/build-foundation.sh

@@ -40,48 +40,16 @@ build_target_toolchain() {
   env DESTDIR="$TRIPLE_DESTDIR" \
     cmake --install "$TARGET_BUILD_ROOT/$STDLIB_PRODUCT-$HOST_SUFFIX" --prefix /usr
 
-  local swift_testing_build_dir="$TARGET_BUILD_ROOT/wasmswiftsdk-$HOST_SUFFIX/swift-testing/$TRIPLE"
-  # TODO: Remove this check once we build swift-testing for +threads target
-  if [[ -d "$swift_testing_build_dir" ]]; then
-    env DESTDIR="$TRIPLE_DESTDIR" \
-      cmake --install "$swift_testing_build_dir" --prefix /usr
-  fi
+  env DESTDIR="$TRIPLE_DESTDIR" \
+    cmake --install "$TARGET_BUILD_ROOT/wasmswiftsdk-$HOST_SUFFIX/swift-testing/$TRIPLE" --prefix /usr
+  env DESTDIR="$TRIPLE_DESTDIR" \
+    cmake --install "$TARGET_BUILD_ROOT/wasmswiftsdk-$HOST_SUFFIX/foundation/$TRIPLE" --prefix /usr
+  env DESTDIR="$TRIPLE_DESTDIR" \
+    cmake --install "$TARGET_BUILD_ROOT/wasmswiftsdk-$HOST_SUFFIX/xctest/$TRIPLE" --prefix /usr
 
   rm -rf "$TRIPLE_DESTDIR/usr/lib/swift_static/clang/lib/$COMPILER_RT_OS_DIR"
   # XXX: Is this the right way to install compiler-rt?
   cp -R "$TARGET_BUILD_ROOT/wasi-sysroot/$CLANG_MULTIARCH_TRIPLE/lib/$COMPILER_RT_OS_DIR" "$TRIPLE_DESTDIR/usr/lib/swift_static/clang/lib/$COMPILER_RT_OS_DIR"
-
-  # FIXME: Clang resource directory installation is not the best way currently.
-  # We currently have two copies of compiler headers copied from the base toolchain in
-  # lib/swift/clang and lib/swift_static/clang. This is because the Swift CMake build
-  # system installs the compiler headers from the native tools path when not building
-  # tools including clang compiler. This is not ideal but then where should we bring
-  # the compiler headers from? If we use the headers beside the base toolchain, clang
-  # driver will not be able to find libclang_rt.builtins-wasm32.a because it is not
-  # a part of the base toolchain. We need to find a better way to handle this.
-  local CLANG_VERSION
-  CLANG_VERSION="$(basename "$($CLANG_BIN_DIR/clang -print-resource-dir)")"
-  mkdir -p "$TRIPLE_DESTDIR/usr/lib/clang/$CLANG_VERSION/lib"
-  ln -sf "../../../swift_static/clang/lib/$COMPILER_RT_OS_DIR" "$TRIPLE_DESTDIR/usr/lib/clang/$CLANG_VERSION/lib/$COMPILER_RT_OS_DIR"
-}
-
-build_target_corelibs() {
-  local LLVM_BIN_DIR="$1"
-  local CLANG_BIN_DIR="$2"
-  local SWIFT_BIN_DIR="$3"
-  local TRIPLE="$4"
-  local SHORT_TRIPLE="$5"
-
-  local TRIPLE_DESTDIR="$TARGET_TOOLCHAIN_DESTDIR/$TRIPLE"
-  local CORELIBS_ARGS=(
-    "$TRIPLE_DESTDIR"
-    "$LLVM_BIN_DIR"
-    "$CLANG_BIN_DIR"
-    "$SWIFT_BIN_DIR"
-    "$WASI_SYSROOT_PATH/$SHORT_TRIPLE"
-  )
-  "$SCHEMES_BUILD_PATH/build-foundation.sh" "${CORELIBS_ARGS[@]}" "$TRIPLE"
-  "$SCHEMES_BUILD_PATH/build-xctest.sh" "${CORELIBS_ARGS[@]}" "$TRIPLE"
 }
 
 main() {
@@ -171,13 +139,10 @@ main() {
     "$OPTIONS_SWIFT_BIN"
   )
 
-  build_target_toolchain "${BUILD_TOOLS_ARGS[@]}" "wasm32-unknown-wasi" "wasi-wasm32" "wasm32-wasi" "wasmstdlib" "wasi"
+  build_target_toolchain "${BUILD_TOOLS_ARGS[@]}" "wasm32-unknown-wasip1" "wasip1-wasm32" "wasm32-wasip1" "wasmstdlib" "wasip1"
   build_target_toolchain "${BUILD_TOOLS_ARGS[@]}" "wasm32-unknown-wasip1-threads" "wasip1-threads-wasm32" "wasm32-wasip1-threads" "wasmthreadsstdlib" "wasip1"
 
   rsync -av "$WASI_SYSROOT_PATH/" "$PACKAGING_DIR/wasi-sysroot/"
-
-  build_target_corelibs "${BUILD_TOOLS_ARGS[@]}" "wasm32-unknown-wasi" "wasm32-wasi"
-  build_target_corelibs "${BUILD_TOOLS_ARGS[@]}" "wasm32-unknown-wasip1-threads" "wasm32-wasip1-threads"
 }
 
 main "$@"

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

@@ -2,9 +2,4 @@
 
 set -euxo pipefail
 
-SOURCE_PATH="$(cd "$(dirname "$0")/../../../.." && pwd)"
-BUILD_DIR="$SOURCE_PATH/build"
-TARGET_BUILD_ROOT="$BUILD_DIR/WebAssembly"
-
-HOST_SUFFIX=$(find "$TARGET_BUILD_ROOT" -name "wasmstdlib-*" -exec basename {} \; | sed 's/wasmstdlib-//')
-env "PATH=$TARGET_BUILD_ROOT/llvm-$HOST_SUFFIX/bin:$BUILD_DIR/llvm-tools/bin:$PATH" "LIT_FILTER_OUT=(IRGen/|embedded/)" ninja check-swift-wasi-wasm32-custom -C "$TARGET_BUILD_ROOT/wasmstdlib-$HOST_SUFFIX"
+echo "Skipping test because we now run tests in build-script"

schemes/main/build/build-xctest.sh

@@ -1,9 +1,6 @@
 {
   "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",
-    "https://github.com/swiftwasm/libxml2-wasm/releases/download/2.0.0/libxml2-wasm32-unknown-wasip1-threads.tar.gz"
-  ],
+  "libxml2": [],
   "swift-org-download-channel": "development"
 }

schemes/main/build/run-test.sh

@@ -51,7 +51,10 @@ def copy_icu_libs(scheme, build_sdk_path, dist_toolchain_path, target_triple):
         shutil.copy(os.path.join(icu_lib_dir, lib), dest_path)
 
 
-def copy_libxml2_libs(build_sdk_path, dist_toolchain_path, target_triple):
+def copy_libxml2_libs(scheme, build_sdk_path, dist_toolchain_path, target_triple):
+    if scheme not in ["release-6.0", "release-6.1"]:
+        # Recent channels install libxml2 in wasi-sysroot by default
+        return
     import shutil
     lib_dir = os.path.join(build_sdk_path, f"libxml2-{target_triple}", 'lib')
     if not os.path.exists(lib_dir):
@@ -83,7 +86,7 @@ class PackageSwiftSDKAction(Action):
     def run(self):
         build_sdk_path = os.path.join('..', 'build-sdk')
         copy_icu_libs(self.options.scheme, build_sdk_path, self.target_toolchain_path, self.target_triple)
-        copy_libxml2_libs(build_sdk_path, self.target_toolchain_path, self.target_triple)
+        copy_libxml2_libs(self.options.scheme, build_sdk_path, self.target_toolchain_path, self.target_triple)
         self.make_swift_sdk(
             self.target_toolchain_path,
             self.wasi_sysroot_path,
@@ -207,8 +210,12 @@ def main():
 
     toolchain_channel = derive_toolchain_channel(options.scheme)
     triples = [
-        ["wasm32-unknown-wasi", "wasm32-wasi"],
+        ["wasm32-unknown-wasip1", "wasm32-wasip1"],
     ]
+    if options.scheme in ["release-6.0", "release-6.1"]:
+        triples = [
+            ["wasm32-unknown-wasi", "wasm32-wasi"],
+        ]
     if options.scheme not in ["release-6.0"]:
         triples += [
             ["wasm32-unknown-wasip1-threads", "wasm32-wasip1-threads"]

schemes/main/manifest.json

@@ -11,7 +11,7 @@ from build_support.actions import derive_options_from_args, REPO_ROOT, DownloadB
 def main():
     parser = argparse.ArgumentParser(
         description='Run e2e integration tests for Swift SDK')
-    parser.add_argument('--swift-sdk', default='wasm32-unknown-wasi',
+    parser.add_argument('--swift-sdk', default='wasm32-unknown-wasip1',
                         help='Swift SDK identifier (default: wasm32-unknown-wasi)')
     parser.add_argument('args', nargs=argparse.REMAINDER,
                         help='Extra arguments to pass to lit.py')