Skip to content

Commit

Permalink
Auto merge of rust-lang#75593 - Mark-Simulacrum:compiler-docs-must-no…
Browse files Browse the repository at this point in the history
…t-overlap, r=<try>

Adjust installation place for compiler docs

This avoids conflicts when installing with rustup; rustup does not currently
support overlapping installations.

r? @matthiaskrgr
  • Loading branch information
bors committed Aug 16, 2020
2 parents 7a4fb35 + 172e67e commit 532ad7b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/bootstrap/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ impl Step for RustcDocs {
let image = tmpdir(builder).join(format!("{}-{}-image", name, host.triple));
let _ = fs::remove_dir_all(&image);

let dst = image.join("share/doc/rust/html");
let dst = image.join("share/doc/rust/html/rustc");
t!(fs::create_dir_all(&dst));
let src = builder.compiler_doc_out(host);
builder.cp_r(&src, &dst);
Expand All @@ -181,7 +181,7 @@ impl Step for RustcDocs {
.arg(format!("--package-name={}-{}", name, host.triple))
.arg("--component-name=rustc-docs")
.arg("--legacy-manifest-dirs=rustlib,cargo")
.arg("--bulk-dirs=share/doc/rust/html");
.arg("--bulk-dirs=share/doc/rust/html/rustc");

builder.info(&format!("Dist compiler docs ({})", host));
let _time = timeit(builder);
Expand Down

0 comments on commit 532ad7b

Please sign in to comment.