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

Auto merge of #57891 - michaelwoerister:no-default-incr-bootstrap, r=pietroalbini

Browse source 
bootstrap: Don't rely on any default settings regarding incr. comp. in Cargo

https://github.com/rust-lang/cargo/pull/6564 (temporarily) makes incremental compilation the default for release builds. We don't want this default to apply to building the compiler itself, that is, `bootstrap`'s `incremental` flag should always be respected. Otherwise we'll get incrementally build releases, which we really don't want `:)`.

r? @Mark-Simulacrum

Anybody else from @rust-lang/release should feel free to r+ this too if they get around to it earlier.
This commit is contained in:
bors 2019-01-25 11:25:14 +00:00
commit 7187db619c
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/bootstrap/builder.rs
View file

@ -991,6 +991,9 @@ impl<'a> Builder<'a> {
if self.config.incremental { if self.config.incremental {
cargo.env("CARGO_INCREMENTAL", "1"); cargo.env("CARGO_INCREMENTAL", "1");
} else {
// Don't rely on any default setting for incr. comp. in Cargo
cargo.env("CARGO_INCREMENTAL", "0");
} }
if let Some(ref on_fail) = self.config.on_fail { if let Some(ref on_fail) = self.config.on_fail {