diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2020-08-16 11:38:46 -0400 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2020-08-16 11:42:43 -0400 |
| commit | 172e67e487f59e58a3ce61886bfec61ec5f21fa5 (patch) | |
| tree | 4e5663705de557e6bc35eb73127d4e53d6201b6d /src/bootstrap | |
| parent | 7a4fb355c6ce4e534e0998d83b68591bbe234ddb (diff) | |
| download | rust-172e67e487f59e58a3ce61886bfec61ec5f21fa5.tar.gz rust-172e67e487f59e58a3ce61886bfec61ec5f21fa5.zip | |
Adjust installation place for compiler docs
This avoids conflicts when installing with rustup; rustup does not currently support overlapping installations.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/dist.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 98b6be29c07..01121977f13 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -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); @@ -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); |
