Rollup merge of #51436 - Mark-Simulacrum:doc-stage1, r=QuietMisdreavus

Mark-Simulacrum · web-flow · commit efb30d769506 · 2018-06-08T17:21:09.000-06:00
Do not require stage 2 compiler for rustdoc r? @QuietMisdreavus Fixes #51424 I *think* this is correct; though I'm not certain. If it passes CI though I expect that to be good enough...
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
@@ -800,10 +800,7 @@ impl<'a> Builder<'a> {
             cargo.env("RUSTC_ERROR_FORMAT", error_format);
         }
         if cmd != "build" && cmd != "check" && want_rustdoc {
-            cargo.env(
-                "RUSTDOC_LIBDIR",
-                self.rustc_libdir(self.compiler(2, self.config.build)),
-            );
+            cargo.env("RUSTDOC_LIBDIR", self.sysroot_libdir(compiler, self.config.build));
         }
 
         if mode.is_tool() {

Original file line number	Diff line number	Diff line change
`@@ -800,10 +800,7 @@ impl<'a> Builder<'a> {`
`800`	`800`	`cargo.env("RUSTC_ERROR_FORMAT", error_format);`
`801`	`801`	`}`
`802`	`802`	`if cmd != "build" && cmd != "check" && want_rustdoc {`
`803`		`- cargo.env(`
`804`		`- "RUSTDOC_LIBDIR",`
`805`		`- self.rustc_libdir(self.compiler(2, self.config.build)),`
`806`		`- );`
	`803`	`+ cargo.env("RUSTDOC_LIBDIR", self.sysroot_libdir(compiler, self.config.build));`
`807`	`804`	`}`
`808`	`805`
`809`	`806`	`if mode.is_tool() {`