Merge pull request #1504 from swiftwasm/maxd/5.3-foundation-xctest

Build Foundation/XCTest for the 5.3 branch

Author: MaxDesiatov

utils/update_checkout/update-checkout-config.json

@@ -87,8 +87,8 @@
                 "swiftpm": "swiftwasm-release/5.3",
                 "swift-syntax": "release/5.3",
                 "swift-stress-tester": "release/5.3",
-                "swift-corelibs-xctest": "release/5.3",
-                "swift-corelibs-foundation": "release/5.3",
+                "swift-corelibs-xctest": "swiftwasm-release/5.3",
+                "swift-corelibs-foundation": "swiftwasm-release/5.3",
                 "swift-corelibs-libdispatch": "release/5.3",
                 "swift-integration-tests": "release/5.3",
                 "swift-xcode-playground-support": "release/5.3",

utils/webassembly/build-toolchain.sh

@@ -82,8 +82,8 @@ sed -i -e "s@\".*/include@\"../../../../share/wasi-sysroot/include@g" $SOURCE_PA
 rsync -v -a $SOURCE_PATH/install/$TOOLCHAIN_NAME/usr/lib/ $HOST_TOOLCHAIN_SDK/usr/lib/ --exclude 'swift/clang'
 
 # FIXME: avoid building foundation for now
-# $UTILS_PATH/build-foundation.sh $HOST_TOOLCHAIN_SDK
-# $UTILS_PATH/build-xctest.sh $HOST_TOOLCHAIN_SDK
+$UTILS_PATH/build-foundation.sh $HOST_TOOLCHAIN_SDK
+$UTILS_PATH/build-xctest.sh $HOST_TOOLCHAIN_SDK
 
 cd $HOST_TOOLCHAIN_DESTDIR
 tar cfz $PACKAGE_ARTIFACT $TOOLCHAIN_NAME

utils/webassembly/toolchain-wasi.cmake

@@ -1,20 +1,19 @@
-set(CMAKE_SYSTEM_NAME Generic)
+set(CMAKE_SYSTEM_NAME WASI)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR wasm32)
 set(triple wasm32-unknown-wasi)
 
-set(WASI_SDK_PREFIX "${SWIFT_SOURCE_PREFIX}/wasi-sdk")
-
-set(CMAKE_C_COMPILER ${WASI_SDK_PREFIX}/bin/clang)
-set(CMAKE_CXX_COMPILER ${WASI_SDK_PREFIX}/bin/clang++)
-set(CMAKE_AR ${WASI_SDK_PREFIX}/bin/llvm-ar CACHE STRING "wasi-sdk build")
-set(CMAKE_RANLIB ${WASI_SDK_PREFIX}/bin/llvm-ranlib CACHE STRING "wasi-sdk build")
+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_PREFIX}/share/wasi-sysroot CACHE STRING "wasi-sdk build")
-set(CMAKE_STAGING_PREFIX ${WASI_SDK_PREFIX}/share/wasi-sysroot CACHE STRING "wasi-sdk build")
+set(CMAKE_SYSROOT "${WASI_SDK_PATH}/share/wasi-sysroot" CACHE STRING "wasi-sdk build")
+message("WASI_SDK_PATH is ${WASI_SDK_PATH}")
+message("sysroot is ${CMAKE_SYSROOT}")
 
 # Don't look in the sysroot for executables to run during the build
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)