From 9eb19273a3ad514529cbb80f22e198e01de18a82 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 2 Nov 2018 15:17:39 +0100 Subject: Update llvm-emscripten This updates emscripten to version 1.38.15, which is based on LLVM 6.0.1. --- src/ci/docker/scripts/emscripten.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ci/docker/scripts') 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 -- cgit 1.4.1-3-g733a5 From ffdb2bc1c5ff0963d1bb1d179c12f5dd218b7612 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 8 Nov 2018 16:32:42 +0100 Subject: Update the disabled wasm32 Dockerfile --- src/ci/docker/disabled/wasm32/Dockerfile | 10 +++++----- src/ci/docker/scripts/emscripten.sh | 5 ----- 2 files changed, 5 insertions(+), 10 deletions(-) (limited to 'src/ci/docker/scripts') diff --git a/src/ci/docker/disabled/wasm32/Dockerfile b/src/ci/docker/disabled/wasm32/Dockerfile index 6ac90d17450..0d2bd39303e 100644 --- a/src/ci/docker/disabled/wasm32/Dockerfile +++ b/src/ci/docker/disabled/wasm32/Dockerfile @@ -21,11 +21,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:/node-v8.0.0-linux-x64/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=wasm32-unknown-emscripten diff --git a/src/ci/docker/scripts/emscripten.sh b/src/ci/docker/scripts/emscripten.sh index dc4b2af792c..1d7b33db9ed 100644 --- a/src/ci/docker/scripts/emscripten.sh +++ b/src/ci/docker/scripts/emscripten.sh @@ -46,8 +46,3 @@ rm -f a.* # Make emsdk usable by any user cp /root/.emscripten /emsdk-portable chmod a+rxw -R /emsdk-portable - -# node 8 is required to run wasm -cd / -curl -sL https://nodejs.org/dist/v8.0.0/node-v8.0.0-linux-x64.tar.xz | \ - tar -xJ -- cgit 1.4.1-3-g733a5