Skip to content

Commit

Permalink
Auto merge of #57891 - michaelwoerister:no-default-incr-bootstrap, r=…
Browse files Browse the repository at this point in the history
…pietroalbini

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

rust-lang/cargo#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.
  • Loading branch information
bors committed Jan 25, 2019
2 parents 5d74d75 + f4fe808 commit 7187db6
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/bootstrap/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -991,6 +991,9 @@ impl<'a> Builder<'a> {

if self.config.incremental {
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 {
Expand Down

0 comments on commit 7187db6

Please sign in to comment.