about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Middleton <olliemail27@gmail.com>2017-10-14 16:35:25 +0100
committerOliver Middleton <olliemail27@gmail.com>2017-10-14 16:42:05 +0100
commit1652c582d7357660e0e441c50aa9aa3500d0f475 (patch)
treeb67a9a02d574be2a95754804ed950df941a3aa75
parentaf7de7b6774b061b7809ce9aa6db31ea29df33c8 (diff)
downloadrust-1652c582d7357660e0e441c50aa9aa3500d0f475.tar.gz
rust-1652c582d7357660e0e441c50aa9aa3500d0f475.zip
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.
-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.