Skip to content

Commit 4b806dd

Browse files
kateinoigakukunyonihemi
authored andcommitted
[WASM] Remove wasi-sdk dependency from compiler-rt build script
1 parent ef7c02a commit 4b806dd

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

utils/webassembly/build-toolchain.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ build_target_toolchain() {
7575
-D CMAKE_C_COMPILER_LAUNCHER="$(which sccache)" \
7676
-D CMAKE_CXX_COMPILER_LAUNCHER="$(which sccache)" \
7777
-D CMAKE_INSTALL_PREFIX="$DIST_TOOLCHAIN_SDK/usr/lib/clang/10.0.0/" \
78-
-D COMPILER_RT_SWIFT_WASI_SDK_PATH="$WASI_SDK_PATH" \
78+
-D CMAKE_SYSROOT="${WASI_SYSROOT_PATH}" \
7979
-G Ninja \
8080
-S "$SOURCE_PATH/llvm-project/compiler-rt"
8181

utils/webassembly/compiler-rt-cache.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ set(CMAKE_C_COMPILER_TARGET wasm32-wasi CACHE STRING "" FORCE)
44
set(CMAKE_C_COMPILER_FORCED TRUE CACHE BOOL "")
55
set(CMAKE_CXX_COMPILER_FORCED TRUE CACHE BOOL "")
66
set(CMAKE_SYSTEM_NAME Wasm)
7-
set(CMAKE_SYSROOT ${COMPILER_RT_SWIFT_WASI_SDK_PATH}/share/wasi-sysroot CACHE STRING "")
87
set(CMAKE_SIZEOF_VOID_P 4 CACHE STRING "")
98
set(COMPILER_RT_BAREMETAL_BUILD ON CACHE BOOL "")
109
set(COMPILER_RT_BUILD_XRAY OFF CACHE BOOL "")

0 commit comments

Comments
 (0)