From 7007a44cf28dafb11deb595b63fcdfa82cc24a03 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 28 Aug 2017 18:32:29 -0700 Subject: [PATCH] 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 55358f2ffcb..645037a9211 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -718,7 +718,7 @@ fn python(&self) -> &Path { 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 -- 2.44.0