bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Stylistic changes

Browse source
This commit is contained in:
Alex Crichton 2019-09-10 09:10:24 -07:00
parent 160787129b
commit 9b34ef643f
1 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/bootstrap/builder.rs
View file

@ -1079,12 +1079,9 @@ impl<'a> Builder<'a> {
} }
} }
match mode { if let Mode::Rustc | Mode::Codegen = mode {
Mode::Rustc | Mode::Codegen => { rustflags.arg("-Zunstable-options");
rustflags.arg("-Zunstable-options"); rustflags.arg("-Wrustc::internal");
rustflags.arg("-Wrustc::internal");
}
_ => {}
} }
// Throughout the build Cargo can execute a number of build scripts // Throughout the build Cargo can execute a number of build scripts
@ -1230,11 +1227,8 @@ impl<'a> Builder<'a> {
// When we build Rust dylibs they're all intended for intermediate // When we build Rust dylibs they're all intended for intermediate
// usage, so make sure we pass the -Cprefer-dynamic flag instead of // usage, so make sure we pass the -Cprefer-dynamic flag instead of
// linking all deps statically into the dylib. // linking all deps statically into the dylib.
match mode { if let Mode::Std | Mode::Rustc | Mode::Codegen = mode {
Mode::Std | Mode::Rustc | Mode::Codegen => { rustflags.arg("-Cprefer-dynamic");
rustflags.arg("-Cprefer-dynamic");
}
_ => {}
} }
Cargo { Cargo {
@ -1348,7 +1342,7 @@ impl Rustflags {
fn new(target: &str, cmd: &mut Command) -> Rustflags { fn new(target: &str, cmd: &mut Command) -> Rustflags {
let mut ret = Rustflags(String::new()); let mut ret = Rustflags(String::new());
// Inherit `RUSTFLAGS` by default // Inherit `RUSTFLAGS` by default ...
ret.env("RUSTFLAGS"); ret.env("RUSTFLAGS");
// ... and also handle target-specific env RUSTFLAGS if they're // ... and also handle target-specific env RUSTFLAGS if they're
@ -1358,7 +1352,7 @@ impl Rustflags {
ret.env(&target_specific); ret.env(&target_specific);
cmd.env_remove(&target_specific); cmd.env_remove(&target_specific);
return ret; ret
} }
fn env(&mut self, env: &str) { fn env(&mut self, env: &str) {