about summary refs log tree commit diff
path: root/src/ci/docker
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-02-10 14:24:07 +0800
committerGitHub <noreply@github.com>2018-02-10 14:24:07 +0800
commit22c5067ae16cdb430d9202fd5e6ce07fdfb6fc0f (patch)
treee6112b414acef9ee990efe49fc9e600cdfe22b7f /src/ci/docker
parent3554c3ab6f8b4b0689618d585098554c0b855bdd (diff)
parent9c05babe25bd25db423c7f83c31de000ee4d4db7 (diff)
downloadrust-22c5067ae16cdb430d9202fd5e6ce07fdfb6fc0f.tar.gz
rust-22c5067ae16cdb430d9202fd5e6ce07fdfb6fc0f.zip
Rollup merge of #48098 - alexcrichton:fix-i686-dist-bootstrap, r=Mark-Simulacrum
ci: Actually bootstrap on i686 dist

Right now the `--build` option was accidentally omitted, so we're bootstraping
from `x86_64` to `i686`. In addition to being slower (more compiles) that's not
actually bootstrapping!
Diffstat (limited to 'src/ci/docker')
-rw-r--r--src/ci/docker/dist-i686-linux/Dockerfile3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ci/docker/dist-i686-linux/Dockerfile b/src/ci/docker/dist-i686-linux/Dockerfile
index 0fd6af6e10d..5e405aa72e8 100644
--- a/src/ci/docker/dist-i686-linux/Dockerfile
+++ b/src/ci/docker/dist-i686-linux/Dockerfile
@@ -86,7 +86,8 @@ ENV RUST_CONFIGURE_ARGS \
       --enable-extended \
       --enable-sanitizers \
       --enable-profiler \
-      --enable-emscripten
+      --enable-emscripten \
+      --build=i686-unknown-linux-gnu
 ENV SCRIPT python2.7 ../x.py dist --host $HOSTS --target $HOSTS
 
 # This is the only builder which will create source tarballs