Skip to content

Commit c2b02e4

Browse files
authored
Rollup merge of rust-lang#121079 - onur-ozkan:install-conflicts, r=albertlarsan68
distribute tool documentations and avoid file conflicts on `x install` I suggest reading commits one-by-one with the descriptions for more context about the changes. Fixes rust-lang#115213
2 parents 9ccabc8 + e4a15d4 commit c2b02e4

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/bootstrap/src/core/build_steps/dist.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -398,10 +398,11 @@ impl Step for Rustc {
398398
let host = compiler.host;
399399
let src = builder.sysroot(compiler);
400400

401-
// Copy rustc/rustdoc binaries
401+
// Copy rustc binary
402+
builder.install(&src.join("bin").join("rustc"), &image.join("bin"), 0o755);
402403
t!(fs::create_dir_all(image.join("bin")));
403-
builder.cp_r(&src.join("bin"), &image.join("bin"));
404404

405+
// If enabled, copy rustdoc binary
405406
if builder
406407
.config
407408
.tools

src/bootstrap/src/core/build_steps/install.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ fn install_sh(
9595
}
9696

9797
let datadir = prefix.join(default_path(&builder.config.datadir, "share"));
98-
let docdir = prefix.join(default_path(&builder.config.docdir, "share/doc/rust"));
98+
let docdir = prefix.join(default_path(&builder.config.docdir, &format!("share/doc/{package}")));
9999
let mandir = prefix.join(default_path(&builder.config.mandir, "share/man"));
100100
let libdir = prefix.join(default_path(&builder.config.libdir, "lib"));
101101
let bindir = prefix.join(&builder.config.bindir); // Default in config.rs

0 commit comments

Comments
 (0)