Skip to content

Commit 0ca7d3d

Browse files
committed
bootstrap: rename Config.rebuild to .local_rebuild
1 parent 1cae0c5 commit 0ca7d3d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/bootstrap/build/config.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ pub struct Config {
6767
pub target: Vec<String>,
6868
pub rustc: Option<String>,
6969
pub cargo: Option<String>,
70-
pub rebuild: bool,
70+
pub local_rebuild: bool,
7171

7272
// libstd features
7373
pub debug_jemalloc: bool,
@@ -316,7 +316,7 @@ impl Config {
316316
("RPATH", self.rust_rpath),
317317
("OPTIMIZE_TESTS", self.rust_optimize_tests),
318318
("DEBUGINFO_TESTS", self.rust_debuginfo_tests),
319-
("LOCAL_REBUILD", self.rebuild),
319+
("LOCAL_REBUILD", self.local_rebuild),
320320
}
321321

322322
match key {

src/bootstrap/build/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ impl Build {
511511
.arg("--target").arg(target);
512512

513513
let stage;
514-
if compiler.stage == 0 && self.config.rebuild {
514+
if compiler.stage == 0 && self.config.local_rebuild {
515515
// Assume the local-rebuild rustc already has stage1 features.
516516
stage = 1;
517517
} else {
@@ -752,7 +752,7 @@ impl Build {
752752
// In stage0 we're using a previously released stable compiler, so we
753753
// use the stage0 bootstrap key. Otherwise we use our own build's
754754
// bootstrap key.
755-
let bootstrap_key = if compiler.is_snapshot(self) && !self.config.rebuild {
755+
let bootstrap_key = if compiler.is_snapshot(self) && !self.config.local_rebuild {
756756
&self.bootstrap_key_stage0
757757
} else {
758758
&self.bootstrap_key

0 commit comments

Comments
 (0)