Skip to content

Commit 75c2cfb

Browse files
committed
Update emscripten version
Emscripten and rustc have to use compatible versions of LLVM to avoid linker error. With the update to LLVM 11, emscripten also requires an update, see rust-lang/rust#75716. Also, now the emscripten is updated, the fix for emscripten-core/emscripten#4542 is now avalibe, which means we can delete the node-wasm workaround. Signed-off-by: Joe Richey <[email protected]>
1 parent 4f213ba commit 75c2cfb

File tree

3 files changed

+3
-52
lines changed

3 files changed

+3
-52
lines changed

docker/Dockerfile.asmjs-unknown-emscripten

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN /cmake.sh
99
COPY xargo.sh /
1010
RUN /xargo.sh
1111

12-
COPY --from=trzeci/emscripten:1.38.46-upstream /emsdk_portable /emsdk_portable
12+
COPY --from=trzeci/emscripten:1.39.20-upstream /emsdk_portable /emsdk_portable
1313

1414
ENV EMSDK /emsdk_portable
1515
ENV EMSCRIPTEN=${EMSDK}/emscripten/sdk

docker/Dockerfile.wasm32-unknown-emscripten

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN /cmake.sh
99
COPY xargo.sh /
1010
RUN /xargo.sh
1111

12-
COPY --from=trzeci/emscripten:1.38.46-upstream /emsdk_portable /emsdk_portable
12+
COPY --from=trzeci/emscripten:1.39.20-upstream /emsdk_portable /emsdk_portable
1313

1414
ENV EMSDK /emsdk_portable
1515
ENV EMSCRIPTEN=${EMSDK}/emscripten/sdk
@@ -27,5 +27,4 @@ RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
2727
libxml2 \
2828
python
2929

30-
COPY node-wasm /usr/local/bin/
31-
ENV CARGO_TARGET_WASM32_UNKNOWN_EMSCRIPTEN_RUNNER=node-wasm
30+
ENV CARGO_TARGET_WASM32_UNKNOWN_EMSCRIPTEN_RUNNER=node

docker/node-wasm

-48
This file was deleted.

0 commit comments

Comments
 (0)