diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs
index df15cbc931462..b04e4de774453 100644
--- a/src/bootstrap/check.rs
+++ b/src/bootstrap/check.rs
@@ -119,7 +119,7 @@ impl Step for Linkcheck {
     }
 
     fn make_run(run: RunConfig) {
-        run.builder.ensure(Linkcheck { host: run.host });
+        run.builder.ensure(Linkcheck { host: run.target });
     }
 }
 
@@ -140,7 +140,7 @@ impl Step for Cargotest {
     fn make_run(run: RunConfig) {
         run.builder.ensure(Cargotest {
             stage: run.builder.top_stage,
-            host: run.host,
+            host: run.target,
         });
     }
 
diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
index c521a148e5d45..1ee578bb62b19 100644
--- a/src/bootstrap/doc.rs
+++ b/src/bootstrap/doc.rs
@@ -192,7 +192,7 @@ impl Step for TheBook {
 
     fn make_run(run: RunConfig) {
         run.builder.ensure(TheBook {
-            compiler: run.builder.compiler(run.builder.top_stage, run.host),
+            compiler: run.builder.compiler(run.builder.top_stage, run.builder.build.build),
             target: run.target,
             name: "book",
         });
@@ -296,7 +296,7 @@ impl Step for Standalone {
 
     fn make_run(run: RunConfig) {
         run.builder.ensure(Standalone {
-            compiler: run.builder.compiler(run.builder.top_stage, run.host),
+            compiler: run.builder.compiler(run.builder.top_stage, run.builder.build.build),
             target: run.target,
         });
     }
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
index 3f1adcccab51a..862b3e2b1edb0 100644
--- a/src/bootstrap/tool.rs
+++ b/src/bootstrap/tool.rs
@@ -247,17 +247,17 @@ impl Step for Rustdoc {
     fn run(self, builder: &Builder) -> PathBuf {
         let target_compiler = self.target_compiler;
         let build_compiler = if target_compiler.stage == 0 {
-            target_compiler
+            builder.compiler(0, builder.build.build)
         } else {
             // Similar to `compile::Assemble`, build with the previous stage's compiler. Otherwise
             // we'd have stageN/bin/rustc and stageN/bin/rustdoc be effectively different stage
             // compilers, which isn't what we want.
-            builder.compiler(target_compiler.stage - 1, target_compiler.host)
+            builder.compiler(target_compiler.stage - 1, builder.build.build)
         };
 
         let tool_rustdoc = builder.ensure(ToolBuild {
             compiler: build_compiler,
-            target: build_compiler.host,
+            target: target_compiler.host,
             tool: "rustdoc",
             mode: Mode::Librustc,
         });