Skip to content

Commit

Permalink
Update emscripten version
Browse files Browse the repository at this point in the history
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 <joerichey@google.com>
  • Loading branch information
josephlr committed Jan 5, 2021
1 parent 4f213ba commit 75c2cfb
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 52 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile.asmjs-unknown-emscripten
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN /cmake.sh
COPY xargo.sh /
RUN /xargo.sh

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

ENV EMSDK /emsdk_portable
ENV EMSCRIPTEN=${EMSDK}/emscripten/sdk
Expand Down
5 changes: 2 additions & 3 deletions docker/Dockerfile.wasm32-unknown-emscripten
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN /cmake.sh
COPY xargo.sh /
RUN /xargo.sh

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

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

COPY node-wasm /usr/local/bin/
ENV CARGO_TARGET_WASM32_UNKNOWN_EMSCRIPTEN_RUNNER=node-wasm
ENV CARGO_TARGET_WASM32_UNKNOWN_EMSCRIPTEN_RUNNER=node
48 changes: 0 additions & 48 deletions docker/node-wasm

This file was deleted.

0 comments on commit 75c2cfb

Please sign in to comment.