@@ -3,6 +3,7 @@ FROM ubuntu:22.04
3
3
ARG DEBIAN_FRONTEND=noninteractive
4
4
RUN apt-get update && apt-get install -y --no-install-recommends \
5
5
clang-11 \
6
+ llvm-11 \
6
7
g++ \
7
8
make \
8
9
ninja-build \
@@ -38,10 +39,14 @@ WORKDIR /
38
39
COPY scripts/sccache.sh /scripts/
39
40
RUN sh /scripts/sccache.sh
40
41
42
+ COPY host-x86_64/dist-various-2/build-wasi-toolchain.sh /tmp/
43
+ RUN /tmp/build-wasi-toolchain.sh
44
+
41
45
ENV RUST_CONFIGURE_ARGS \
42
46
--musl-root-x86_64=/usr/local/x86_64-linux-musl \
43
47
--set build.nodejs=/node-v18.12.0-linux-x64/bin/node \
44
- --set rust.lld
48
+ --set rust.lld \
49
+ --set target.wasm32-wasip1.wasi-root=/wasm32-wasip1
45
50
46
51
# Some run-make tests have assertions about code size, and enabling debug
47
52
# assertions in libstd causes the binary to be much bigger than it would
@@ -50,7 +55,11 @@ ENV RUST_CONFIGURE_ARGS \
50
55
ENV NO_DEBUG_ASSERTIONS=1
51
56
ENV NO_OVERFLOW_CHECKS=1
52
57
53
- ENV WASM_TARGETS=wasm32-unknown-unknown
58
+ RUN curl -L https://github.com/bytecodealliance/wasmtime/releases/download/v18.0.2/wasmtime-v18.0.2-x86_64-linux.tar.xz | \
59
+ tar -xJ
60
+ ENV PATH "$PATH:/wasmtime-v18.0.2-x86_64-linux"
61
+
62
+ ENV WASM_TARGETS=wasm32-wasip1
54
63
ENV WASM_SCRIPT python3 /checkout/x.py --stage 2 test --host='' --target $WASM_TARGETS \
55
64
tests/run-make \
56
65
tests/ui \
@@ -59,7 +68,9 @@ ENV WASM_SCRIPT python3 /checkout/x.py --stage 2 test --host='' --target $WASM_T
59
68
tests/codegen \
60
69
tests/assembly \
61
70
library/core
62
- ENV CC_wasm32_unknown_unknown=clang-11
71
+ ENV CC_wasm32_wasip1=clang-11 \
72
+ CFLAGS_wasm32_wasip1="--sysroot /wasm32-wasip1" \
73
+ AR_wasm32_wasip1=llvm-ar-11
63
74
64
75
ENV NVPTX_TARGETS=nvptx64-nvidia-cuda
65
76
ENV NVPTX_SCRIPT python3 /checkout/x.py --stage 2 test --host='' --target $NVPTX_TARGETS \
0 commit comments