squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

No need to remove target-specific RUSTFLAGS

Browse source 
Turns out Cargo favors RUSTFLAGS!
This commit is contained in:
Alex Crichton 2019-09-11 08:06:25 -07:00
parent 7342325dfb
commit ff6a7c77ae
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/bootstrap/builder.rs
View file

@ -815,7 +815,7 @@ impl<'a> Builder<'a> {
stage = compiler.stage;
}
let mut rustflags = Rustflags::new(&target, &mut cargo);
let mut rustflags = Rustflags::new(&target);
if stage != 0 {
rustflags.env("RUSTFLAGS_NOT_BOOTSTRAP");
} else {
@ -1339,18 +1339,16 @@ mod tests;
struct Rustflags(String);
impl Rustflags {
fn new(target: &str, cmd: &mut Command) -> Rustflags {
fn new(target: &str) -> Rustflags {
let mut ret = Rustflags(String::new());
// Inherit `RUSTFLAGS` by default ...
ret.env("RUSTFLAGS");
// ... and also handle target-specific env RUSTFLAGS if they're
// configured. If this is configured we also remove it from the
// environment because Cargo will prefer it over RUSTFLAGS.
// configured.
let target_specific = format!("CARGO_TARGET_{}_RUSTFLAGS", crate::envify(target));
ret.env(&target_specific);
cmd.env_remove(&target_specific);
ret
}