2 files changed, 6 insertions, 14 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index e25a7e18525..5563b153f5a 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -163,7 +163,7 @@ impl Step for RustcDocs {
         let image = tmpdir(build).join(format!("{}-{}-image", name, host));
         let _ = fs::remove_dir_all(&image);
 
-        let dst = image.join("share/doc/rustc/html");
+        let dst = image.join("share/doc/rust/html");
         t!(fs::create_dir_all(&dst));
         let src = build.compiler_doc_out(host);
         cp_r(&src, &dst);
@@ -179,7 +179,7 @@ impl Step for RustcDocs {
            .arg(format!("--package-name={}-{}", name, host))
            .arg("--component-name=rustc-docs")
            .arg("--legacy-manifest-dirs=rustlib,cargo")
-           .arg("--bulk-dirs=share/doc/rustc/html");
+           .arg("--bulk-dirs=share/doc/rust/html");
         build.run(&mut cmd);
         t!(fs::remove_dir_all(&image));
 
diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
index e525bdb98fc..44073a5b075 100644
--- a/src/bootstrap/doc.rs
+++ b/src/bootstrap/doc.rs
@@ -690,17 +690,10 @@ impl Step for Rustc {
         builder.ensure(compile::Rustc { compiler, target });
         let out_dir = build.stage_out(compiler, Mode::Librustc)
                            .join(target).join("doc");
-
-        // See docs in std above for why we symlink
-        //
-        // This step must happen after other documentation steps. This
-        // invariant ensures that compiler documentation is not included
-        // in the standard documentation tarballs but that all the
-        // documentation from the standard documentation tarballs is included
-        // in the compiler documentation tarball.
-        let my_out = build.crate_doc_out(target);
-        build.clear_if_dirty(&my_out, &rustdoc);
-        t!(symlink_dir_force(&my_out, &out_dir));
+        // We do not symlink to the same shared folder that already contains std library
+        // documentation from previous steps as we do not want to include that.
+        build.clear_if_dirty(&out, &rustdoc);
+        t!(symlink_dir_force(&out, &out_dir));
 
         let mut cargo = builder.cargo(compiler, Mode::Librustc, target, "doc");
         compile::rustc_cargo(build, &mut cargo);
@@ -720,7 +713,6 @@ impl Step for Rustc {
         }
 
         build.run(&mut cargo);
-        cp_r(&my_out, &out);
     }
 }