Skip to content

Commit 942f31f

Browse files
committed
Auto merge of #45432 - ollie27:rustbuild_error_index_gen, r=Mark-Simulacrum
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. It was broken by #44605. r? @alexcrichton
2 parents b6055cb + 2045e07 commit 942f31f

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/bootstrap/tool.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -193,12 +193,12 @@ macro_rules! tool {
193193
}
194194

195195
pub fn tool_default_stage(&self, tool: Tool) -> u32 {
196-
// Compile the error-index in the top stage as it depends on
197-
// rustdoc, so we want to avoid recompiling rustdoc twice if we
198-
// can. Otherwise compile everything else in stage0 as there's
199-
// no need to rebootstrap everything
196+
// Compile the error-index in the same stage as rustdoc to avoid
197+
// recompiling rustdoc twice if we can. Otherwise compile
198+
// everything else in stage0 as there's no need to rebootstrap
199+
// everything.
200200
match tool {
201-
Tool::ErrorIndex => self.top_stage,
201+
Tool::ErrorIndex if self.top_stage >= 2 => self.top_stage,
202202
_ => 0,
203203
}
204204
}

0 commit comments

Comments
 (0)