31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
From 66a47182d10542b68773d8a1cb9230a4918a5068 Mon Sep 17 00:00:00 2001
|
|
From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
|
|
Date: Thu, 2 Aug 2018 08:49:36 +0200
|
|
Subject: [PATCH] rustbuild: fix local_rebuild
|
|
|
|
If we detect a local rebuild (e.g. bootstrap compiler is the same version as target compiler), we set stage to 1.
|
|
When trying to build e.g. UnstableBook, we use Mode::ToolBootstrap and stage is 1.
|
|
Just allow Mode::ToolBootstrap and stagge != 0 if we are in a local_rebuild
|
|
|
|
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
|
|
---
|
|
src/bootstrap/builder.rs | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
|
|
index 724d3b741903..dc0b0aaf0bb3 100644
|
|
--- a/src/bootstrap/builder.rs
|
|
+++ b/src/bootstrap/builder.rs
|
|
@@ -777,7 +777,7 @@ impl<'a> Builder<'a> {
|
|
// compiler, but for tools we just use the precompiled libraries that
|
|
// we've downloaded
|
|
let use_snapshot = mode == Mode::ToolBootstrap;
|
|
- assert!(!use_snapshot || stage == 0);
|
|
+ assert!(!use_snapshot || stage == 0 || self.local_rebuild);
|
|
|
|
let maybe_sysroot = self.sysroot(compiler);
|
|
let sysroot = if use_snapshot {
|
|
--
|
|
2.17.1
|
|
|