Skip to content

Commit db87685

Browse files
alexcrichtontgross35
authored andcommitted
Update wasi-sdk in CI, plus some script updates
* Update to wasi-sdk-29 which is the latest * Pass `-Clink-self-contained=n` instead of `-Ctarget-feature=-crt-static` (which didn't work) to force using the external libc. (backport <#4837>) (cherry picked from commit 6259f3a)
1 parent 7a709ff commit db87685

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

ci/docker/wasm32-wasip1/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN /wasi.sh
1010
# library.
1111
ENV CARGO_TARGET_WASM32_WASIP1_RUNNER=wasmtime \
1212
CARGO_TARGET_WASM32_WASIP1_LINKER=/opt/wasi-sdk/bin/clang \
13-
CARGO_TARGET_WASM32_WASIP1_RUSTFLAGS="-lwasi-emulated-process-clocks -Ctarget-feature=-crt-static" \
13+
CARGO_TARGET_WASM32_WASIP1_RUSTFLAGS="-Clink-self-contained=n -lwasi-emulated-process-clocks" \
1414
CC_wasm32_wasip1=/opt/wasi-sdk/bin/clang \
1515
CFLAGS_wasm32_wasip1=-D_WASI_EMULATED_PROCESS_CLOCKS \
1616
PATH=$PATH:/rust/bin:/wasmtime

ci/docker/wasm32-wasip2/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN /wasi.sh
99
# itself, this should be fixed upstream.
1010
ENV CARGO_TARGET_WASM32_WASIP2_RUNNER=wasmtime \
1111
CARGO_TARGET_WASM32_WASIP2_LINKER=/opt/wasi-sdk/bin/clang \
12-
CARGO_TARGET_WASM32_WASIP2_RUSTFLAGS="-lwasi-emulated-process-clocks -Ctarget-feature=-crt-static -Clink-arg=-Wl,--export,cabi_realloc" \
12+
CARGO_TARGET_WASM32_WASIP2_RUSTFLAGS="-Clink-self-contained=n -lwasi-emulated-process-clocks -Clink-arg=-Wl,--export,cabi_realloc" \
1313
CC_wasm32_wasip2=/opt/wasi-sdk/bin/clang \
1414
CFLAGS_wasm32_wasip2=-D_WASI_EMULATED_PROCESS_CLOCKS \
1515
PATH=$PATH:/rust/bin:/wasmtime

ci/wasi.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ apt-get install -y --no-install-recommends \
1212
# Wasmtime is used to execute tests and wasi-sdk is used to compile tests.
1313
# Download appropriate versions here and configure various flags below.
1414
wasmtime=38.0.2
15-
wasi_sdk=27
15+
wasi_sdk=29
1616

1717
curl -L https://github.com/bytecodealliance/wasmtime/releases/download/v$wasmtime/wasmtime-v$wasmtime-x86_64-linux.tar.xz |
1818
tar xJf -

0 commit comments

Comments
 (0)