[WASM] Remove wasi-sdk dependency from build-script

Author: kateinoigakukun

cmake/modules/SwiftConfigureSDK.cmake

@@ -402,10 +402,10 @@ macro(configure_sdk_unix name architectures)
         if(NOT arch STREQUAL wasm32)
           message(FATAL_ERROR "unsupported arch for WebAssembly: ${arch}")
         endif()
-        set(SWIFT_SDK_WASI_ARCH_wasm32_PATH "${SWIFT_WASI_SDK_PATH}/share/wasi-sysroot")
+        set(SWIFT_SDK_WASI_ARCH_wasm32_PATH "${SWIFT_WASI_SYSROOT_PATH}")
         set(SWIFT_SDK_WASI_ARCH_wasm32_TRIPLE "wasm32-unknown-wasi")
-        set(SWIFT_SDK_WASI_ARCH_wasm32_LIBC_INCLUDE_DIRECTORY "${SWIFT_WASI_SDK_PATH}/share/wasi-sysroot/include")
-        set(SWIFT_SDK_WASI_ARCH_wasm32_LIBC_ARCHITECTURE_INCLUDE_DIRECTORY "${SWIFT_WASI_SDK_PATH}/share/wasi-sysroot/include")
+        set(SWIFT_SDK_WASI_ARCH_wasm32_LIBC_INCLUDE_DIRECTORY "${SWIFT_WASI_SYSROOT_PATH}/include")
+        set(SWIFT_SDK_WASI_ARCH_wasm32_LIBC_ARCHITECTURE_INCLUDE_DIRECTORY "${SWIFT_WASI_SYSROOT_PATH}/include")
       else()
         message(FATAL_ERROR "unknown Unix OS: ${prefix}")
       endif()

test/lit.site.cfg.in

@@ -44,9 +44,6 @@ config.darwin_xcrun_toolchain = "@SWIFT_DARWIN_XCRUN_TOOLCHAIN@"
 config.android_ndk_path = "@SWIFT_ANDROID_NDK_PATH@"
 config.android_ndk_gcc_version = "@SWIFT_ANDROID_NDK_GCC_VERSION@"
 
-# --- WebAssembly ---
-config.wasi_sdk_path = "@SWIFT_WASI_SDK_PATH@"
-
 # --- Windows ---
 msvc_runtime_flags = {
   'MultiThreaded': 'MT',

utils/build-script

@@ -251,9 +251,9 @@ def validate_arguments(toolchain, args):
                 "--android-icu-i18n-include, and --android-icu-data "
                 "must be specified")
     if args.wasm:
-        if args.wasi_sdk is None:
+        if args.wasi_sysroot is None:
             fatal_error(
-                "when building for WebAssembly, --wasi-sdk must be specified")
+                "when building for WebAssembly, --wasi-sysroot must be specified")
 
     targets_needing_toolchain = [
         'build_indexstoredb',
@@ -697,7 +697,7 @@ class BuildScriptInvocation(object):
 
         if args.wasm:
             impl_args += [
-                "--wasi-sdk", args.wasi_sdk,
+                "--wasi-sysroot", args.wasi_sysroot,
             ]
 
         if platform.system() == 'Darwin':

utils/build-script-impl

@@ -119,7 +119,7 @@ KNOWN_SETTINGS=(
     darwin-xcrun-toolchain                        "default"         "the name of the toolchain to use on Darwin"
 
     ## WebAssembly/WASI Options
-    wasi-sdk                                      ""                "An absolute path to the WASI SDK that will be used as a libc implementation for Wasm builds"
+    wasi-sysroot                                  ""                "An absolute path to the wasi-sysroot that will be used as a libc implementation for Wasm builds"
 
     ## Build Types for Components
     swift-stdlib-build-type                       "Debug"           "the CMake build variant for Swift"
@@ -1786,7 +1786,7 @@ for host in "${ALL_HOSTS[@]}"; do
                 if [[ ! "${SKIP_BUILD_WASM}" ]]; then
                     cmake_options=(
                         "${cmake_options[@]}"
-                        -DSWIFT_WASI_SDK_PATH:STRING="${WASI_SDK}"
+                        -DSWIFT_WASI_SYSROOT_PATH:STRING="${WASI_SYSROOT}"
                     )
                 fi
 

utils/build_swift/build_swift/driver_arguments.py

@@ -1130,8 +1130,8 @@ def create_argument_parser():
     # -------------------------------------------------------------------------
     in_group('Build settings for WebAssembly')
 
-    option('--wasi-sdk', store_path,
-           help='An absolute path to WASI SDK that will be used as a libc '
+    option('--wasi-sysroot', store_path,
+           help='An absolute path to wasi-sysroot that will be used as a libc '
                 'implementation for Wasm builds')
 
     # -------------------------------------------------------------------------

utils/webassembly/build-toolchain.sh

@@ -94,7 +94,7 @@ build_target_toolchain() {
     -D CMAKE_INSTALL_PREFIX="$DIST_TOOLCHAIN_SDK/usr" \
     -D LLVM_DIR="$HOST_BUILD_DIR/llvm-$HOST_SUFFIX/lib/cmake/llvm/" \
     -D SWIFT_NATIVE_SWIFT_TOOLS_PATH="$HOST_BUILD_DIR/swift-$HOST_SUFFIX/bin" \
-    -D SWIFT_WASI_SDK_PATH="$WASI_SDK_PATH" \
+    -D SWIFT_WASI_SYSROOT_PATH="$WASI_SYSROOT_PATH" \
     -G Ninja \
     -S "$SOURCE_PATH/swift"