about summary refs log tree commit diff
path: root/src/ci/docker/asmjs
diff options
context:
space:
mode:
authorThomas Lively <tlively@google.com>2019-10-16 17:06:34 -0700
committerThomas Lively <tlively@google.com>2019-10-16 17:06:48 -0700
commit4b26d9c142efcbd175dad36f7cb4ebf9e682154e (patch)
tree1c351825585a33f4cbfffc046ad93f10c1e6ad57 /src/ci/docker/asmjs
parent36808c251c47f4eafe4cc074867ac5fe8b194041 (diff)
User should not change between emcc install and use
Diffstat (limited to 'src/ci/docker/asmjs')
-rw-r--r--src/ci/docker/asmjs/Dockerfile4
1 files changed, 3 insertions, 1 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