diff options
| author | bors <bors@rust-lang.org> | 2019-01-25 11:25:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-25 11:25:14 +0000 |
| commit | 7187db619c134697647f96e82111cbcbae337d4f (patch) | |
| tree | 0d0f1be7c17203f95584c183737a5e122defea69 /src | |
| parent | 5d74d75d1af7339ff4b583dc91e30fc81ce4836e (diff) | |
| parent | f4fe8085f827d0d8be25713b72bea90b31db1894 (diff) | |
| download | rust-7187db619c134697647f96e82111cbcbae337d4f.tar.gz rust-7187db619c134697647f96e82111cbcbae337d4f.zip | |
Auto merge of #57891 - michaelwoerister:no-default-incr-bootstrap, r=pietroalbini
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/builder.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index c3dc9458839..a69ba207495 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -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 { |