From 1652c582d7357660e0e441c50aa9aa3500d0f475 Mon Sep 17 00:00:00 2001 From: Oliver Middleton Date: Sat, 14 Oct 2017 16:35:25 +0100 Subject: [PATCH] rustbuild: Don't try to build rustdoc API docs with compiler docs rustdoc is built separately to rustc now so the docs would need to be generated separately as well. Also rustdoc doesn't build at stage 1 which prevented the compiler docs being built at stage 1. --- src/bootstrap/doc.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs index b9a52a66793..9d24f35c294 100644 --- a/src/bootstrap/doc.rs +++ b/src/bootstrap/doc.rs @@ -623,11 +623,9 @@ fn run(self, builder: &Builder) { compile::rustc_cargo(build, &compiler, target, &mut cargo); if build.config.compiler_docs { - // src/rustc/Cargo.toml contains bin crates called rustc and rustdoc - // which would otherwise overwrite the docs for the real rustc and - // rustdoc lib crates. - cargo.arg("-p").arg("rustc_driver") - .arg("-p").arg("rustdoc"); + // src/rustc/Cargo.toml contains a bin crate called rustc which + // would otherwise overwrite the docs for the real rustc lib crate. + cargo.arg("-p").arg("rustc_driver"); } else { // Like with libstd above if compiler docs aren't enabled then we're not // documenting internal dependencies, so we have a whitelist. -- 2.44.0