diff options
| author | bors <bors@rust-lang.org> | 2020-07-02 12:35:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-02 12:35:08 +0000 |
| commit | 8a6d4342be6a6acbade8e7ef65e73d27ee8c9144 (patch) | |
| tree | bdb127fa9e94e052cdae4c50e5212d8080863342 /src/ci | |
| parent | b7856f695d65a8ebc846754f97d15814bcb1c244 (diff) | |
| parent | 4f536f2c36622328e7eb1d859cb74ba0a7d34ac8 (diff) | |
| download | rust-8a6d4342be6a6acbade8e7ef65e73d27ee8c9144.tar.gz rust-8a6d4342be6a6acbade8e7ef65e73d27ee8c9144.zip | |
Auto merge of #73954 - Manishearth:rollup-8qvh170, r=Manishearth
Rollup of 10 pull requests Successful merges: - #73414 (Implement `slice_strip` feature) - #73564 (linker: Create GNU_EH_FRAME header by default when producing ELFs) - #73622 (Deny unsafe ops in unsafe fns in libcore) - #73684 (add spans to injected coverage counters, extract with CoverageData query) - #73812 (ast_pretty: Pass some token streams and trees by reference) - #73853 (Add newline to rustc MultiSpan docs) - #73883 (Compile rustdoc less often.) - #73885 (Fix wasm32 being broken due to a NodeJS version bump) - #73903 (Changes required for rustc/cargo to build for iOS targets) - #73938 (Optimise fast path of checked_ops with `unlikely`) Failed merges: r? @ghost
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/wasm32/Dockerfile | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/ci/docker/wasm32/Dockerfile b/src/ci/docker/wasm32/Dockerfile index 8232539edda..92461305320 100644 --- a/src/ci/docker/wasm32/Dockerfile +++ b/src/ci/docker/wasm32/Dockerfile @@ -25,7 +25,18 @@ RUN ln `which python3` /usr/bin/python ENV PATH=$PATH:/emsdk-portable ENV PATH=$PATH:/emsdk-portable/upstream/emscripten/ -ENV PATH=$PATH:/emsdk-portable/node/12.9.1_64bit/bin/ + +# Rust's build system requires NodeJS to be in the path, but the directory in +# which emsdk stores it contains the version number. This caused breakages in +# the past when emsdk bumped the node version causing the path to point to a +# missing directory. +# +# To avoid the problem this symlinks the latest NodeJs version available to +# "latest", and adds that to the path. +RUN ln -s /emsdk-portable/node/$(ls /emsdk-portable/node | sort -V | tail -n 1) \ + /emsdk-portable/node/latest +ENV PATH=$PATH:/emsdk-portable/node/latest/bin/ + ENV BINARYEN_ROOT=/emsdk-portable/upstream/ ENV EMSDK=/emsdk-portable ENV EM_CONFIG=/emsdk-portable/.emscripten |