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

Do not require stage 2 compiler for rustdoc

r? @QuietMisdreavus

Fixes https://github.com/rust-lang/rust/issues/51424

I *think* this is correct; though I'm not certain. If it passes CI though I expect that to be good enough...
This commit is contained in:
Mark Rousskov 2018-06-08 17:21:09 -06:00 committed by GitHub
commit efb30d7695
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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() {