bootstrap: rename Config.rebuild to .local_rebuild

diff --git a/src/bootstrap/build/config.rs b/src/bootstrap/build/config.rs
index 060fb5b8ef3d6af27b30586a6aa2b0a1c432c5d7..fb1ad12d914fc9ec18d03f7ff9746e0f11f1e183 100644 (file)
--- a/src/bootstrap/build/config.rs
+++ b/src/bootstrap/build/config.rs
@@ -67,7 +67,7 @@ pub struct Config {
     pub target: Vec<String>,
     pub rustc: Option<String>,
     pub cargo: Option<String>,
-    pub rebuild: bool,
+    pub local_rebuild: bool,
 
     // libstd features
     pub debug_jemalloc: bool,
@@ -316,7 +316,7 @@ macro_rules! check {
                 ("RPATH", self.rust_rpath),
                 ("OPTIMIZE_TESTS", self.rust_optimize_tests),
                 ("DEBUGINFO_TESTS", self.rust_debuginfo_tests),
-                ("LOCAL_REBUILD", self.rebuild),
+                ("LOCAL_REBUILD", self.local_rebuild),
             }
 
             match key {

diff --git a/src/bootstrap/build/mod.rs b/src/bootstrap/build/mod.rs
index 9d5a093ab9e096b9d42dc19775feac49908b6b03..21d12d27d92e1cc38d6284a87f683d659010bb10 100644 (file)
--- a/src/bootstrap/build/mod.rs
+++ b/src/bootstrap/build/mod.rs
@@ -511,7 +511,7 @@ fn cargo(&self,
              .arg("--target").arg(target);
 
         let stage;
-        if compiler.stage == 0 && self.config.rebuild {
+        if compiler.stage == 0 && self.config.local_rebuild {
             // Assume the local-rebuild rustc already has stage1 features.
             stage = 1;
         } else {
@@ -752,7 +752,7 @@ fn add_bootstrap_key(&self, compiler: &Compiler, cmd: &mut Command) {
         // In stage0 we're using a previously released stable compiler, so we
         // use the stage0 bootstrap key. Otherwise we use our own build's
         // bootstrap key.
-        let bootstrap_key = if compiler.is_snapshot(self) && !self.config.rebuild {
+        let bootstrap_key = if compiler.is_snapshot(self) && !self.config.local_rebuild {
             &self.bootstrap_key_stage0
         } else {
             &self.bootstrap_key