Skip to content

Commit 7187db6

Browse files
committed
Auto merge of #57891 - michaelwoerister:no-default-incr-bootstrap, r=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.
2 parents 5d74d75 + f4fe808 commit 7187db6

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

src/bootstrap/builder.rs

+3
Original file line numberDiff line numberDiff line change
@@ -991,6 +991,9 @@ impl<'a> Builder<'a> {
991991

992992
if self.config.incremental {
993993
cargo.env("CARGO_INCREMENTAL", "1");
994+
} else {
995+
// Don't rely on any default setting for incr. comp. in Cargo
996+
cargo.env("CARGO_INCREMENTAL", "0");
994997
}
995998

996999
if let Some(ref on_fail) = self.config.on_fail {

0 commit comments

Comments
 (0)