diff options
| author | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2018-08-02 08:49:36 +0200 |
|---|---|---|
| committer | Pietro Albini <pietro@pietroalbini.org> | 2018-09-01 10:25:23 +0200 |
| commit | 1aa4bbbe39c4ec9588a7bc8d4dc4b56d1967c432 (patch) | |
| tree | b48502e1416992ad556dc0206c1c889f4ebd29e8 | |
| parent | 98bedcbfd0e1419df749e859937d994ccaa72c91 (diff) | |
| download | rust-1aa4bbbe39c4ec9588a7bc8d4dc4b56d1967c432.tar.gz rust-1aa4bbbe39c4ec9588a7bc8d4dc4b56d1967c432.zip | |
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>
| -rw-r--r-- | src/bootstrap/builder.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 724d3b74190..dc0b0aaf0bb 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 { |