about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-01-07 04:02:43 +0000
committerbors <bors@rust-lang.org>2017-01-07 04:02:43 +0000
commitb6c97c3da6306a56d7a2b9f04f38854a67b1d7b2 (patch)
tree0cea18071d90bd3096d62be927df908437a0b85b
parent25bfc8aedc805d217e8dd0df606f1ca013a6c838 (diff)
parent6b96ece247d4858b0d80058118d5090ad0a1fd91 (diff)
downloadrust-b6c97c3da6306a56d7a2b9f04f38854a67b1d7b2.tar.gz
rust-b6c97c3da6306a56d7a2b9f04f38854a67b1d7b2.zip
Auto merge of #38858 - ollie27:rustbuild_docs_std, r=alexcrichton
rustbuild: Stop building docs for std dependancies

Fixes: #38319

r? @alexcrichton
-rw-r--r--src/bootstrap/doc.rs11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
index 42eae6d24f1..2b063741c07 100644
--- a/src/bootstrap/doc.rs
+++ b/src/bootstrap/doc.rs
@@ -152,7 +152,16 @@ pub fn std(build: &Build, stage: u32, target: &str) {
     cargo.arg("--manifest-path")
          .arg(build.src.join("src/rustc/std_shim/Cargo.toml"))
          .arg("--features").arg(build.std_features())
-         .arg("-p").arg("std");
+         .arg("--no-deps");
+
+    for krate in &["alloc", "collections", "core", "std", "std_unicode"] {
+        cargo.arg("-p").arg(krate);
+        // Create all crate output directories first to make sure rustdoc uses
+        // relative links.
+        // FIXME: Cargo should probably do this itself.
+        t!(fs::create_dir_all(out_dir.join(krate)));
+    }
+
     build.run(&mut cargo);
     cp_r(&out_dir, &out)
 }