swiftwasm · kateinoigakukun · Jan 3, 2021 · Jan 3, 2021 · Jan 3, 2021 · Jan 3, 2021
diff --git a/cmake/modules/SwiftConfigureSDK.cmake b/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()

diff --git a/test/lit.site.cfg.in b/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',

diff --git a/utils/build-script b/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':

diff --git a/utils/build-script-impl b/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
 

diff --git a/utils/build_swift/build_swift/driver_arguments.py b/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')
 
     # -------------------------------------------------------------------------

diff --git a/utils/webassembly/build-foundation.sh b/utils/webassembly/build-foundation.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 set -ex
 DESTINATION_TOOLCHAIN=$1
+WASI_SYSROOT_PATH=$2
 SOURCE_PATH="$(cd "$(dirname $0)/../../.." && pwd)"
 
 FOUNDATION_BUILD="$SOURCE_PATH/target-build/foundation-wasi-wasm32"
@@ -9,13 +10,15 @@ mkdir -p $FOUNDATION_BUILD
 cd $FOUNDATION_BUILD
 
 cmake -G Ninja \
+  -DCMAKE_SYSROOT="$WASI_SYSROOT_PATH" \
   -DCMAKE_Swift_COMPILER="$DESTINATION_TOOLCHAIN/usr/bin/swiftc" \
   -DCMAKE_STAGING_PREFIX="$DESTINATION_TOOLCHAIN/usr" \
   -DCMAKE_TOOLCHAIN_FILE="$SOURCE_PATH/swift/utils/webassembly/toolchain-wasi.cmake" \
-  -DWASI_SDK_PATH="$SOURCE_PATH/wasi-sdk" \
+  -DLLVM_BIN="$DESTINATION_TOOLCHAIN/usr/bin" \
   -DICU_ROOT="$SOURCE_PATH/icu_out" \
   -DBUILD_SHARED_LIBS=OFF \
   -DCMAKE_Swift_COMPILER_FORCED=ON \
+  -DCMAKE_ASM_FLAGS="-target wasm32-unknown-wasi" \
   "${SOURCE_PATH}/swift-corelibs-foundation"
 
 ninja -v

diff --git a/utils/webassembly/build-toolchain.sh b/utils/webassembly/build-toolchain.sh
@@ -4,7 +4,8 @@ set -ex
 SOURCE_PATH="$(cd "$(dirname "$0")/../../.." && pwd)"
 UTILS_PATH="$(cd "$(dirname "$0")" && pwd)"
 
-WASI_SDK_PATH=$SOURCE_PATH/wasi-sdk
+WASI_SDK_PATH="$SOURCE_PATH/wasi-sdk"
+WASI_SYSROOT_PATH="$WASI_SDK_PATH/share/wasi-sysroot"
 
 case $(uname -s) in
   Darwin)
@@ -74,7 +75,7 @@ build_target_toolchain() {
     -D CMAKE_C_COMPILER_LAUNCHER="$(which sccache)" \
     -D CMAKE_CXX_COMPILER_LAUNCHER="$(which sccache)" \
     -D CMAKE_INSTALL_PREFIX="$DIST_TOOLCHAIN_SDK/usr/lib/clang/10.0.0/" \
-    -D COMPILER_RT_SWIFT_WASI_SDK_PATH="$WASI_SDK_PATH" \
+    -D CMAKE_SYSROOT="${WASI_SYSROOT_PATH}" \
     -G Ninja \
     -S "$SOURCE_PATH/llvm-project/compiler-rt"
 
@@ -93,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"
 
@@ -110,8 +111,8 @@ build_target_toolchain() {
   # Remove host CoreFoundation module directory to avoid module conflict
   # while building Foundation
   rm -rf "$DIST_TOOLCHAIN_SDK/usr/lib/swift_static/CoreFoundation"
-  "$UTILS_PATH/build-foundation.sh" "$DIST_TOOLCHAIN_SDK"
-  "$UTILS_PATH/build-xctest.sh" "$DIST_TOOLCHAIN_SDK"
+  "$UTILS_PATH/build-foundation.sh" "$DIST_TOOLCHAIN_SDK" "$WASI_SYSROOT_PATH"
+  "$UTILS_PATH/build-xctest.sh" "$DIST_TOOLCHAIN_SDK" "$WASI_SYSROOT_PATH"
 
 }
 

diff --git a/utils/webassembly/build-xctest.sh b/utils/webassembly/build-xctest.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 set -ex
 DESTINATION_TOOLCHAIN=$1
+WASI_SYSROOT_PATH=$2
 SOURCE_PATH="$(cd "$(dirname $0)/../../.." && pwd)"
 
 BUILD_DIR="$SOURCE_PATH/target-build/xctest-wasi-wasm32"
@@ -9,10 +10,11 @@ mkdir -p $BUILD_DIR
 cd $BUILD_DIR
 
 cmake -G Ninja \
+  -DCMAKE_SYSROOT="$WASI_SYSROOT_PATH" \
   -DCMAKE_Swift_COMPILER="$DESTINATION_TOOLCHAIN/usr/bin/swiftc" \
   -DCMAKE_STAGING_PREFIX="$DESTINATION_TOOLCHAIN/usr" \
   -DCMAKE_TOOLCHAIN_FILE="$SOURCE_PATH/swift/utils/webassembly/toolchain-wasi.cmake" \
-  -DWASI_SDK_PATH="$SOURCE_PATH/wasi-sdk" \
+  -DLLVM_BIN="$DESTINATION_TOOLCHAIN/usr/bin" \
   -DBUILD_SHARED_LIBS=OFF \
   -DCMAKE_Swift_COMPILER_FORCED=ON \
   -DSWIFT_FOUNDATION_PATH=$DESTINATION_TOOLCHAIN/usr/lib/swift_static/wasi/wasm32 \

diff --git a/utils/webassembly/compiler-rt-cache.cmake b/utils/webassembly/compiler-rt-cache.cmake
@@ -4,7 +4,6 @@ set(CMAKE_C_COMPILER_TARGET wasm32-wasi CACHE STRING "" FORCE)
 set(CMAKE_C_COMPILER_FORCED TRUE CACHE BOOL "")
 set(CMAKE_CXX_COMPILER_FORCED TRUE CACHE BOOL "")
 set(CMAKE_SYSTEM_NAME Wasm)
-set(CMAKE_SYSROOT ${COMPILER_RT_SWIFT_WASI_SDK_PATH}/share/wasi-sysroot CACHE STRING "")
 set(CMAKE_SIZEOF_VOID_P 4 CACHE STRING "")
 set(COMPILER_RT_BAREMETAL_BUILD ON CACHE BOOL "")
 set(COMPILER_RT_BUILD_XRAY OFF CACHE BOOL "")

diff --git a/utils/webassembly/toolchain-wasi.cmake b/utils/webassembly/toolchain-wasi.cmake
@@ -3,15 +3,13 @@ set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR wasm32)
 set(triple wasm32-unknown-wasi)
 
-set(CMAKE_C_COMPILER "${WASI_SDK_PATH}/bin/clang")
-set(CMAKE_CXX_COMPILER "${WASI_SDK_PATH}/bin/clang++")
-set(CMAKE_AR "${WASI_SDK_PATH}/bin/llvm-ar" CACHE STRING "wasi-sdk build")
-set(CMAKE_RANLIB "${WASI_SDK_PATH}/bin/llvm-ranlib" CACHE STRING "wasi-sdk build")
-set(CMAKE_C_COMPILER_TARGET ${triple} CACHE STRING "wasi-sdk build")
-set(CMAKE_CXX_COMPILER_TARGET ${triple} CACHE STRING "wasi-sdk build")
-set(CMAKE_EXE_LINKER_FLAGS "-Wl,--no-threads" CACHE STRING "wasi-sdk build")
-
-set(CMAKE_SYSROOT ${WASI_SDK_PATH}/share/wasi-sysroot CACHE STRING "wasi-sdk build")
+set(CMAKE_C_COMPILER "${LLVM_BIN}/clang")
+set(CMAKE_CXX_COMPILER "${LLVM_BIN}/clang++")
+set(CMAKE_AR "${LLVM_BIN}/llvm-ar" CACHE STRING "LLVM Archiver for wasm32")
+set(CMAKE_RANLIB "${LLVM_BIN}/llvm-ranlib" CACHE STRING "LLVM Ranlib for wasm32")
+set(CMAKE_C_COMPILER_TARGET ${triple} CACHE STRING "")
+set(CMAKE_CXX_COMPILER_TARGET ${triple} CACHE STRING "")
+set(CMAKE_EXE_LINKER_FLAGS "-Wl,--no-threads" CACHE STRING "Single thread options")
 
 # Don't look in the sysroot for executables to run during the build
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)