Skip to content

Commit

Permalink
Rollup merge of rust-lang#121079 - onur-ozkan:install-conflicts, r=al…
Browse files Browse the repository at this point in the history
…bertlarsan68

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
  • Loading branch information
matthiaskrgr authored Feb 17, 2024
2 parents d163d54 + e4a15d4 commit a3aef2e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions src/bootstrap/src/core/build_steps/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -398,10 +398,11 @@ impl Step for Rustc {
let host = compiler.host;
let src = builder.sysroot(compiler);

// Copy rustc/rustdoc binaries
// Copy rustc binary
builder.install(&src.join("bin").join("rustc"), &image.join("bin"), 0o755);
t!(fs::create_dir_all(image.join("bin")));
builder.cp_r(&src.join("bin"), &image.join("bin"));

// If enabled, copy rustdoc binary
if builder
.config
.tools
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/src/core/build_steps/install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ fn install_sh(
}

let datadir = prefix.join(default_path(&builder.config.datadir, "share"));
let docdir = prefix.join(default_path(&builder.config.docdir, "share/doc/rust"));
let docdir = prefix.join(default_path(&builder.config.docdir, &format!("share/doc/{package}")));
let mandir = prefix.join(default_path(&builder.config.mandir, "share/man"));
let libdir = prefix.join(default_path(&builder.config.libdir, "lib"));
let bindir = prefix.join(&builder.config.bindir); // Default in config.rs
Expand Down

0 comments on commit a3aef2e

Please sign in to comment.