about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorThomas Lively <tlively@google.com>2019-10-11 17:14:48 -0700
committerThomas Lively <tlively@google.com>2019-10-16 17:06:48 -0700
commitb0b6e368c0d1fe35d7813c319a535a0ad09a1d47 (patch)
treed8f63a77b8039bff185bd42d96e767d28f511cf1 /src
parenta2264f6af59f47497ccea65f29198edd2eb5ce58 (diff)
Update test and add -O1 to wasm32 Dockerfile
Diffstat (limited to 'src')
-rw-r--r--src/ci/docker/asmjs/Dockerfile2
-rw-r--r--src/ci/docker/wasm32/Dockerfile3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ci/docker/asmjs/Dockerfile b/src/ci/docker/asmjs/Dockerfile
index 75db374907d..24e9311d680 100644
--- a/src/ci/docker/asmjs/Dockerfile
+++ b/src/ci/docker/asmjs/Dockerfile
@@ -29,8 +29,6 @@ ENV EM_CONFIG=/emsdk-portable/.emscripten
 ENV TARGETS=asmjs-unknown-emscripten
 
 # Use -O1 optimizations in the link step to reduce time spent optimizing JS.
-# FIXME: Switch to testing wasm32-unknown-emscripten and -O1 to save more time
-# once the CI picks up https://github.com/rust-lang/cargo/pull/7476.
 ENV EMCC_CFLAGS=-O1
 
 ENV SCRIPT python2.7 ../x.py test --target $TARGETS
diff --git a/src/ci/docker/wasm32/Dockerfile b/src/ci/docker/wasm32/Dockerfile
index aeccbb9bdc0..7a305591511 100644
--- a/src/ci/docker/wasm32/Dockerfile
+++ b/src/ci/docker/wasm32/Dockerfile
@@ -28,6 +28,9 @@ 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
+
 # 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 \