about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorTom Eccles <tom.eccles@codethink.co.uk>2021-03-30 18:36:53 +0100
committerTom Eccles <tom.eccles@codethink.co.uk>2021-03-30 18:47:34 +0100
commit8f97b948e36e16a309df436259ac38bb92975eea (patch)
treec2b773743bb0350d329b605ecb7b48ce777678b7 /src/bootstrap
parent7b6fc5a3dd73a341010bd51a19008ed679cd1475 (diff)
downloadrust-8f97b948e36e16a309df436259ac38bb92975eea.tar.gz
rust-8f97b948e36e16a309df436259ac38bb92975eea.zip
bootstrap: don't complain about linkcheck if it is excluded
We don't need to complain to the user about linkcheck having different
hosts and targets when it is already excluded. This can be achieved by
moving the check to when the step is run instead of in should_run.
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/test.rs26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index f4976f2f436..adb0a372c64 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -108,6 +108,19 @@ impl Step for Linkcheck {
     /// documentation to ensure we don't have a bunch of dead ones.
     fn run(self, builder: &Builder<'_>) {
         let host = self.host;
+        let hosts = &builder.hosts;
+        let targets = &builder.targets;
+
+        // if we have different hosts and targets, some things may be built for
+        // the host (e.g. rustc) and others for the target (e.g. std). The
+        // documentation built for each will contain broken links to
+        // docs built for the other platform (e.g. rustc linking to cargo)
+        if (hosts != targets) && !hosts.is_empty() && !targets.is_empty() {
+            panic!(
+                "Linkcheck currently does not support builds with different hosts and targets.
+You can skip linkcheck with --exclude src/tools/linkchecker"
+            );
+        }
 
         builder.info(&format!("Linkcheck ({})", host));
 
@@ -123,19 +136,6 @@ impl Step for Linkcheck {
     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
         let builder = run.builder;
         let run = run.path("src/tools/linkchecker");
-        let hosts = &builder.hosts;
-        let targets = &builder.targets;
-
-        // if we have different hosts and targets, some things may be built for
-        // the host (e.g. rustc) and others for the target (e.g. std). The
-        // documentation built for each will contain broken links to
-        // docs built for the other platform (e.g. rustc linking to cargo)
-        if (hosts != targets) && !hosts.is_empty() && !targets.is_empty() {
-            panic!(
-                "Linkcheck currently does not support builds with different hosts and targets.
-You can skip linkcheck with --exclude src/tools/linkchecker"
-            );
-        }
         run.default_condition(builder.config.docs)
     }