Skip to content

Commit

Permalink
Rollup merge of rust-lang#51436 - Mark-Simulacrum:doc-stage1, r=Quiet…
Browse files Browse the repository at this point in the history
…Misdreavus

Do not require stage 2 compiler for rustdoc

r? @QuietMisdreavus

Fixes rust-lang#51424

I *think* this is correct; though I'm not certain. If it passes CI though I expect that to be good enough...
  • Loading branch information
Mark-Simulacrum authored Jun 8, 2018
2 parents 4a2c1c2 + 721f2e7 commit efb30d7
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions src/bootstrap/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down

0 comments on commit efb30d7

Please sign in to comment.