From 7007a44cf28dafb11deb595b63fcdfa82cc24a03 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 28 Aug 2017 18:32:29 -0700 Subject: [PATCH 1/2] rustbuild: Fix uplifting stage1 on cross builds When we pass `--host` the `self.hosts` array doesn't contain `self.build`, so check `self.build` to see if we can uplift. --- src/bootstrap/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 55358f2ffcb73..645037a921122 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -718,7 +718,7 @@ impl Build { fn force_use_stage1(&self, compiler: Compiler, target: Interned) -> bool { !self.config.full_bootstrap && compiler.stage >= 2 && - self.hosts.iter().any(|h| *h == target) + (self.hosts.iter().any(|h| *h == target) || target == self.build) } /// Returns the directory that OpenSSL artifacts are compiled into if From 1d70b66fe49660006f35a699ef5733e97c0786f0 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 28 Aug 2017 18:33:01 -0700 Subject: [PATCH 2/2] rustbuild: Don't require cross-compiled error index All architectures use the same errors, no need to cross-compile a version only to not look at it. --- src/bootstrap/doc.rs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs index 86f5346bea1fb..b9a52a66793df 100644 --- a/src/bootstrap/doc.rs +++ b/src/bootstrap/doc.rs @@ -669,11 +669,6 @@ impl Step for ErrorIndex { let build = builder.build; let target = self.target; - builder.ensure(compile::Rustc { - compiler: builder.compiler(0, build.build), - target, - }); - println!("Documenting error index ({})", target); let out = build.doc_out(target); t!(fs::create_dir_all(&out));