Skip to content

Commit 449e8ea

Browse files
committed
Auto merge of rust-lang#73213 - ehuss:fix-emsdk, r=Mark-Simulacrum
Fix emcc failure for wasm32. The wasm32 job is currently failing on CI with the error `ERROR: llc executable not found at /usr/bin/llc`. The issue is that emscripten-core/emsdk#472 has changed how emsdk discovers its configuration. We were relying on the global behavior that would use a configuration from the home directory. However, it looks like emsdk is moving away from that approach. This change adds the necessary env var for emcc to find the correct configuration. There are a few alternate approaches this could take. The `--no-embedded` option could be passed to `emsdk activate` to use the old behavior, but it seems like they want to move away from that. Another option is to source `emsdk_env.sh`, which is how these env vars normally get set. I'm not entirely sure how to do that easily in a Dockerfile, though.
2 parents bb86748 + cd02052 commit 449e8ea

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

src/ci/docker/wasm32/Dockerfile

+3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ ENV PATH=$PATH:/emsdk-portable
2727
ENV PATH=$PATH:/emsdk-portable/upstream/emscripten/
2828
ENV PATH=$PATH:/emsdk-portable/node/12.9.1_64bit/bin/
2929
ENV BINARYEN_ROOT=/emsdk-portable/upstream/
30+
ENV EMSDK=/emsdk-portable
31+
ENV EM_CONFIG=/emsdk-portable/.emscripten
32+
ENV EM_CACHE=/emsdk-portable/upstream/emscripten/cache
3033

3134
ENV TARGETS=wasm32-unknown-emscripten
3235

0 commit comments

Comments
 (0)