From: Oliver Middleton <olliemail27@gmail.com>
Date: Sat, 21 Oct 2017 15:47:18 +0000 (+0100)
Subject: rustbuild: Build stage 1 error index generator at stage 0
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=2045e07745914c935e230ec42a1cdaf1539b6815;p=rust.git

rustbuild: Build stage 1 error index generator at stage 0

At stage 1 rustdoc is built at stage 0 so the error index generator should be as well.

This fixes `x.py --stage 1 doc` as rustdoc doesn't even build at stage 1.
---

diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
index 912ffa51975..688ee6ba295 100644
--- a/src/bootstrap/tool.rs
+++ b/src/bootstrap/tool.rs
@@ -193,12 +193,12 @@ pub fn tool_exe(&self, tool: Tool) -> PathBuf {
             }
 
             pub fn tool_default_stage(&self, tool: Tool) -> u32 {
-                // Compile the error-index in the top stage as it depends on
-                // rustdoc, so we want to avoid recompiling rustdoc twice if we
-                // can. Otherwise compile everything else in stage0 as there's
-                // no need to rebootstrap everything
+                // Compile the error-index in the same stage as rustdoc to avoid
+                // recompiling rustdoc twice if we can. Otherwise compile
+                // everything else in stage0 as there's no need to rebootstrap
+                // everything.
                 match tool {
-                    Tool::ErrorIndex => self.top_stage,
+                    Tool::ErrorIndex if self.top_stage >= 2 => self.top_stage,
                     _ => 0,
                 }
             }