]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #38858 - ollie27:rustbuild_docs_std, r=alexcrichton
authorbors <bors@rust-lang.org>
Sat, 7 Jan 2017 04:02:43 +0000 (04:02 +0000)
committerbors <bors@rust-lang.org>
Sat, 7 Jan 2017 04:02:43 +0000 (04:02 +0000)
rustbuild: Stop building docs for std dependancies

Fixes: #38319
r? @alexcrichton

src/bootstrap/doc.rs

index 42eae6d24f13a0926a4055efc22a4b139f2bbd71..2b063741c07401c83038f5c7ac351b25c49a6639 100644 (file)
@@ -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)
 }