summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2018-02-09 10:12:32 -0800
committerAlex Crichton <alex@alexcrichton.com>2018-02-09 10:12:32 -0800
commit9c05babe25bd25db423c7f83c31de000ee4d4db7 (patch)
tree4f64d2882ad6df200bb187584bbf7345bc5a671b /src/bootstrap
parent02537fb90e7e4eb12a69479578b3985665c7e9ad (diff)
downloadrust-9c05babe25bd25db423c7f83c31de000ee4d4db7.tar.gz
rust-9c05babe25bd25db423c7f83c31de000ee4d4db7.zip
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/bootstrap')
-rw-r--r--src/bootstrap/dist.rs7
1 files changed, 7 insertions, 0 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);
             }