diff options
| author | kennytm <kennytm@gmail.com> | 2018-02-10 14:24:07 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-10 14:24:07 +0800 |
| commit | 22c5067ae16cdb430d9202fd5e6ce07fdfb6fc0f (patch) | |
| tree | e6112b414acef9ee990efe49fc9e600cdfe22b7f | |
| parent | 3554c3ab6f8b4b0689618d585098554c0b855bdd (diff) | |
| parent | 9c05babe25bd25db423c7f83c31de000ee4d4db7 (diff) | |
| download | rust-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!
| -rw-r--r-- | src/bootstrap/dist.rs | 7 | ||||
| -rw-r--r-- | src/ci/docker/dist-i686-linux/Dockerfile | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 6717b1cb098..460fb016f16 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -31,6 +31,7 @@ use channel; use util::{cp_r, libdir, is_dylib, cp_filtered, copy, replace_in_file}; use builder::{Builder, RunConfig, ShouldRun, Step}; use compile; +use native; use tool::{self, Tool}; use cache::{INTERNER, Interned}; use time; @@ -898,6 +899,12 @@ impl Step for PlainSourceTarball { .arg("--vers").arg(CARGO_VENDOR_VERSION) .arg("cargo-vendor") .env("RUSTC", &build.initial_rustc); + if let Some(dir) = build.openssl_install_dir(build.config.build) { + builder.ensure(native::Openssl { + target: build.config.build, + }); + cmd.env("OPENSSL_DIR", dir); + } build.run(&mut cmd); } 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 |