diff options
| author | Thomas Lively <tlively@google.com> | 2019-10-16 17:06:34 -0700 |
|---|---|---|
| committer | Thomas Lively <tlively@google.com> | 2019-10-16 17:06:48 -0700 |
| commit | 4b26d9c142efcbd175dad36f7cb4ebf9e682154e (patch) | |
| tree | 1c351825585a33f4cbfffc046ad93f10c1e6ad57 | |
| parent | 36808c251c47f4eafe4cc074867ac5fe8b194041 (diff) | |
| download | rust-4b26d9c142efcbd175dad36f7cb4ebf9e682154e.tar.gz rust-4b26d9c142efcbd175dad36f7cb4ebf9e682154e.zip | |
User should not change between emcc install and use
| -rw-r--r-- | src/ci/docker/asmjs/Dockerfile | 4 | ||||
| -rw-r--r-- | src/ci/docker/scripts/emscripten.sh | 10 | ||||
| -rw-r--r-- | src/ci/docker/wasm32/Dockerfile | 4 |
3 files changed, 6 insertions, 12 deletions
diff --git a/src/ci/docker/asmjs/Dockerfile b/src/ci/docker/asmjs/Dockerfile index 24e9311d680..e27a2a529a8 100644 --- a/src/ci/docker/asmjs/Dockerfile +++ b/src/ci/docker/asmjs/Dockerfile @@ -24,13 +24,15 @@ ENV PATH=$PATH:/emsdk-portable ENV PATH=$PATH:/emsdk-portable/upstream/emscripten/ ENV PATH=$PATH:/emsdk-portable/node/12.9.1_64bit/bin/ ENV BINARYEN_ROOT=/emsdk-portable/upstream/ -ENV EM_CONFIG=/emsdk-portable/.emscripten ENV TARGETS=asmjs-unknown-emscripten # Use -O1 optimizations in the link step to reduce time spent optimizing JS. ENV EMCC_CFLAGS=-O1 +# Emscripten installation is user-specific +ENV NO_CHANGE_USER=1 + ENV SCRIPT python2.7 ../x.py test --target $TARGETS # This is almost identical to the wasm32-unknown-emscripten target, so diff --git a/src/ci/docker/scripts/emscripten.sh b/src/ci/docker/scripts/emscripten.sh index 9c7a09e227a..1be80741594 100644 --- a/src/ci/docker/scripts/emscripten.sh +++ b/src/ci/docker/scripts/emscripten.sh @@ -21,13 +21,3 @@ git clone https://github.com/emscripten-core/emsdk.git /emsdk-portable cd /emsdk-portable hide_output ./emsdk install 1.38.46-upstream ./emsdk activate 1.38.46-upstream - -# Compile and cache libc -source ./emsdk_env.sh -echo "main(){}" > a.c -HOME=/emsdk-portable/ emcc a.c -rm -f a.* - -# Make emsdk usable by any user -cp /root/.emscripten /emsdk-portable -chmod a+rxw -R /emsdk-portable diff --git a/src/ci/docker/wasm32/Dockerfile b/src/ci/docker/wasm32/Dockerfile index 7a305591511..a0f35afd995 100644 --- a/src/ci/docker/wasm32/Dockerfile +++ b/src/ci/docker/wasm32/Dockerfile @@ -24,13 +24,15 @@ ENV PATH=$PATH:/emsdk-portable ENV PATH=$PATH:/emsdk-portable/upstream/emscripten/ ENV PATH=$PATH:/emsdk-portable/node/12.9.1_64bit/bin/ ENV BINARYEN_ROOT=/emsdk-portable/upstream/ -ENV EM_CONFIG=/emsdk-portable/.emscripten ENV TARGETS=wasm32-unknown-emscripten # Use -O1 optimizations in the link step to reduce time spent optimizing. ENV EMCC_CFLAGS=-O1 +# Emscripten installation is user-specific +ENV NO_CHANGE_USER=1 + # FIXME: Re-enable these tests once https://github.com/rust-lang/cargo/pull/7476 # is picked up by CI ENV SCRIPT python2.7 ../x.py test --target $TARGETS \ |