rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

bootstrap: pass crt-static for the compiler host as well

Browse Source
This commit is contained in:
Johannes Nixdorf
2018-04-29 11:21:47 +02:00
parent 5ecf29df05
commit ec2b861c2f
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/bootstrap/bin/rustc.rs
View File

@@ -261,6 +261,15 @@ 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() {

4
src/bootstrap/builder.rs
View File

@@ -663,6 +663,10 @@ 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);