diff options
| author | Josh Stone <cuviper@gmail.com> | 2016-05-23 09:49:46 -0700 |
|---|---|---|
| committer | Josh Stone <cuviper@gmail.com> | 2016-05-23 09:49:46 -0700 |
| commit | 0ca7d3dc1ffdf97284d62960a3c2170dae5f1e43 (patch) | |
| tree | 48d85a08ee5e87753b15d046f868902d7cbf0c9f | |
| parent | 1cae0c5c05021aaf6260b77d772f316d031fbe97 (diff) | |
| download | rust-0ca7d3dc1ffdf97284d62960a3c2170dae5f1e43.tar.gz rust-0ca7d3dc1ffdf97284d62960a3c2170dae5f1e43.zip | |
bootstrap: rename Config.rebuild to .local_rebuild
| -rw-r--r-- | src/bootstrap/build/config.rs | 4 | ||||
| -rw-r--r-- | src/bootstrap/build/mod.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/bootstrap/build/config.rs b/src/bootstrap/build/config.rs index 060fb5b8ef3..fb1ad12d914 100644 --- 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 @@ impl Config { ("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 9d5a093ab9e..21d12d27d92 100644 --- a/src/bootstrap/build/mod.rs +++ b/src/bootstrap/build/mod.rs @@ -511,7 +511,7 @@ impl Build { .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 @@ impl Build { // 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 |