about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-10-21 16:32:31 +0000
committerbors <bors@rust-lang.org>2017-10-21 16:32:31 +0000
commitff8773d7be45699fe1aa847b83d096e1c00a516b (patch)
treec5698ec5891eab051814be16b84bf67763acc5a9 /src
parent7e70546ddbeb8949fcae958d40ead4e4fbcc9d2b (diff)
parent1652c582d7357660e0e441c50aa9aa3500d0f475 (diff)
downloadrust-ff8773d7be45699fe1aa847b83d096e1c00a516b.tar.gz
rust-ff8773d7be45699fe1aa847b83d096e1c00a516b.zip
Auto merge of #45366 - ollie27:rustbuild_compiler_docs, r=alexcrichton
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.

Fixes: #44629
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/doc.rs8
1 files 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 @@ impl Step for Rustc {
         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.