diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-11-02 15:17:39 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-11-04 18:50:57 +0100 |
| commit | 9eb19273a3ad514529cbb80f22e198e01de18a82 (patch) | |
| tree | 9a12db483f20cee5cf14ce5f64672a58943d8be4 /src/ci | |
| parent | ac708826b0d97e105f91a4cde41bfe14cff032f2 (diff) | |
| download | rust-9eb19273a3ad514529cbb80f22e198e01de18a82.tar.gz rust-9eb19273a3ad514529cbb80f22e198e01de18a82.zip | |
Update llvm-emscripten
This updates emscripten to version 1.38.15, which is based on LLVM 6.0.1.
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/asmjs/Dockerfile | 10 | ||||
| -rw-r--r-- | src/ci/docker/scripts/emscripten.sh | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/ci/docker/asmjs/Dockerfile b/src/ci/docker/asmjs/Dockerfile index cb85cf3d9e9..9eaffbf83eb 100644 --- a/src/ci/docker/asmjs/Dockerfile +++ b/src/ci/docker/asmjs/Dockerfile @@ -20,11 +20,11 @@ COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh ENV PATH=$PATH:/emsdk-portable -ENV PATH=$PATH:/emsdk-portable/clang/e1.37.13_64bit/ -ENV PATH=$PATH:/emsdk-portable/emscripten/1.37.13/ -ENV PATH=$PATH:/emsdk-portable/node/4.1.1_64bit/bin/ -ENV EMSCRIPTEN=/emsdk-portable/emscripten/1.37.13/ -ENV BINARYEN_ROOT=/emsdk-portable/clang/e1.37.13_64bit/binaryen/ +ENV PATH=$PATH:/emsdk-portable/clang/e1.38.15_64bit/ +ENV PATH=$PATH:/emsdk-portable/emscripten/1.38.15/ +ENV PATH=$PATH:/emsdk-portable/node/8.9.1_64bit/bin/ +ENV EMSCRIPTEN=/emsdk-portable/emscripten/1.38.15/ +ENV BINARYEN_ROOT=/emsdk-portable/clang/e1.38.15_64bit/binaryen/ ENV EM_CONFIG=/emsdk-portable/.emscripten ENV TARGETS=asmjs-unknown-emscripten diff --git a/src/ci/docker/scripts/emscripten.sh b/src/ci/docker/scripts/emscripten.sh index d32ed6b461d..dc4b2af792c 100644 --- a/src/ci/docker/scripts/emscripten.sh +++ b/src/ci/docker/scripts/emscripten.sh @@ -33,8 +33,8 @@ curl -fL https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portab cd /emsdk-portable ./emsdk update -hide_output ./emsdk install sdk-1.37.13-64bit -./emsdk activate sdk-1.37.13-64bit +hide_output ./emsdk install sdk-1.38.15-64bit +./emsdk activate sdk-1.38.15-64bit # Compile and cache libc source ./emsdk_env.sh |