Revert "bootstrap: pass crt-static for the compiler host as well"
This reverts commit ec2b861c2f.
This commit is contained in:
@@ -268,15 +268,6 @@ fn main() {
|
|||||||
if let Ok(host_linker) = env::var("RUSTC_HOST_LINKER") {
|
if let Ok(host_linker) = env::var("RUSTC_HOST_LINKER") {
|
||||||
cmd.arg(format!("-Clinker={}", 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() {
|
if env::var_os("RUSTC_PARALLEL_QUERIES").is_some() {
|
||||||
|
|||||||
@@ -698,10 +698,6 @@ impl<'a> Builder<'a> {
|
|||||||
cargo.env("RUSTC_CRT_STATIC", x.to_string());
|
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
|
// Enable usage of unstable features
|
||||||
cargo.env("RUSTC_BOOTSTRAP", "1");
|
cargo.env("RUSTC_BOOTSTRAP", "1");
|
||||||
self.add_rust_test_threads(&mut cargo);
|
self.add_rust_test_threads(&mut cargo);
|
||||||
|
|||||||
Reference in New Issue
Block a user