[WASM] Remove wasi-sdk dependency from core-lib build scripts

Author: kateinoigakukun

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,10 +10,11 @@ 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 \

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)
@@ -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"
 
 }
 

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 \

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)