diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2018-05-13 07:44:46 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2018-05-17 10:37:22 -0700 |
| commit | 4ac82b4946ac1df0166ea66a7befe5d1450b07c9 (patch) | |
| tree | 96f6f42706f11964ffdb0200932a16f860192463 /src/bootstrap | |
| parent | 250bff145f74be439023e61ecea1c4cdf673a056 (diff) | |
| download | rust-4ac82b4946ac1df0166ea66a7befe5d1450b07c9.tar.gz rust-4ac82b4946ac1df0166ea66a7befe5d1450b07c9.zip | |
Revert "bootstrap: pass crt-static for the compiler host as well"
This reverts commit ec2b861c2f8013e10ab1f6e01c9aed9ad1daaefe.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/bin/rustc.rs | 9 | ||||
| -rw-r--r-- | src/bootstrap/builder.rs | 4 |
2 files changed, 0 insertions, 13 deletions
diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs index 76d0e6e28ae..3f97accaa4d 100644 --- a/src/bootstrap/bin/rustc.rs +++ b/src/bootstrap/bin/rustc.rs @@ -268,15 +268,6 @@ fn main() { if let Ok(host_linker) = env::var("RUSTC_HOST_LINKER") { cmd.arg(format!("-Clinker={}", host_linker)); } - - if let Ok(s) = env::var("RUSTC_HOST_CRT_STATIC") { - if s == "true" { - cmd.arg("-C").arg("target-feature=+crt-static"); - } - if s == "false" { - cmd.arg("-C").arg("target-feature=-crt-static"); - } - } } if env::var_os("RUSTC_PARALLEL_QUERIES").is_some() { diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index cc1e66332a3..c482adbb390 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -698,10 +698,6 @@ impl<'a> Builder<'a> { cargo.env("RUSTC_CRT_STATIC", x.to_string()); } - if let Some(x) = self.crt_static(compiler.host) { - cargo.env("RUSTC_HOST_CRT_STATIC", x.to_string()); - } - // Enable usage of unstable features cargo.env("RUSTC_BOOTSTRAP", "1"); self.add_rust_test_threads(&mut cargo); |
