diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2018-06-08 17:21:09 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-08 17:21:09 -0600 |
| commit | efb30d7695067603d182f97176f3bf537e263db2 (patch) | |
| tree | 351f078cce4bf8a624013dd7077f5359a470881a | |
| parent | 4a2c1c294f24e6454347a8050ed1ae1dbeaca1d7 (diff) | |
| parent | 721f2e789ae821e85f30ac6bfad8da31b6f1c692 (diff) | |
| download | rust-efb30d7695067603d182f97176f3bf537e263db2.tar.gz rust-efb30d7695067603d182f97176f3bf537e263db2.zip | |
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...
| -rw-r--r-- | src/bootstrap/builder.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 9300b94156a..be9c926bedf 100644 --- 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() { |