mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bootstrap: rename Config.rebuild to .local_rebuild

Browse Source
This commit is contained in:
Josh Stone 2016-05-23 09:49:46 -07:00
parent 1cae0c5c05
commit 0ca7d3dc1f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bootstrap/build/config.rs
View File

@ -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 {

4
src/bootstrap/build/mod.rs
View File

@ -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