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

Auto merge of #49530 - petrhosek:empty-extra-flags, r=cramertj

Browse source 
Only include space in RUSTFLAGS extra flags if not empty

When the RUSTFLAGS_STAGE_{1,2} is not set, including a space means
the string will always be non-empty and RUSTFLAGS will be always be
reset which breaks other ways of setting these such as through config
in CARGO_HOME.
This commit is contained in:
bors 2018-04-01 05:09:48 +00:00
parent 9ceaa5676b c6bae16dc2
commit 804d8c88d9
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/bootstrap/builder.rs
View file

@ -555,7 +555,9 @@ impl<'a> Builder<'a> {
let mut extra_args = env::var(&format!("RUSTFLAGS_STAGE_{}", stage)).unwrap_or_default();
if stage != 0 {
let s = env::var("RUSTFLAGS_STAGE_NOT_0").unwrap_or_default();
extra_args.push_str(" ");
if !extra_args.is_empty() {
extra_args.push_str(" ");
}
extra_args.push_str(&s);
}