From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Wed, 6 Feb 2019 10:37:43 +0000 (+0100)
Subject: Never build rustdoc in stage 0
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=861d007da39418cc145a054cd46c89664ba72e64;p=rust.git

Never build rustdoc in stage 0

When a request for rustdoc is passed for stage 0, x.py build --stage 0
src/tools/rustdoc or ensure(tool::Rustdoc { .. }) with top_stage = 0, we
return the rustdoc for that compiler (i.e., the beta rustdoc).
---

diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
index cd3afc59e56..45bf26f687a 100644
--- a/src/bootstrap/tool.rs
+++ b/src/bootstrap/tool.rs
@@ -418,6 +418,12 @@ fn make_run(run: RunConfig) {
 
     fn run(self, builder: &Builder) -> PathBuf {
         let target_compiler = builder.compiler(builder.top_stage, self.host);
+        if target_compiler.stage == 0 {
+            if !target_compiler.is_snapshot(builder) {
+                panic!("rustdoc in stage 0 must be snapshot rustdoc");
+            }
+            return builder.initial_rustc.with_file_name(exe("rustdoc", &target_compiler.host));
+        }
         let target = target_compiler.host;
         let build_compiler = if target_compiler.stage == 0 {
             builder.compiler(0, builder.config.build)