Skip to content

Commit

Permalink
Rollup merge of rust-lang#128060 - alexcrichton:include-wasm-componen…
Browse files Browse the repository at this point in the history
…t-ld-for-real-this-time-maybe-let-see-after-this-merges, r=onur-ozkan

Fix inclusion of `wasm-component-ld` in dist artifacts

This is another accidental omission from rust-lang#126967 (in addition to rust-lang#127867) which fixes an issue where `wasm-component-ld` isn't distributed via rustup just yet because while it's present in the sysroot it's not present in the tarballs.
  • Loading branch information
matthiaskrgr authored Jul 23, 2024
2 parents f34237f + c3d3d6f commit 417bdc7
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions src/bootstrap/src/core/build_steps/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,11 @@ impl Step for Rustc {
);
}
}
if builder.build_wasm_component_ld() {
let src_dir = builder.sysroot_libdir(compiler, host).parent().unwrap().join("bin");
let ld = exe("wasm-component-ld", compiler.host);
builder.copy_link(&src_dir.join(&ld), &dst_dir.join(&ld));
}

// Man pages
t!(fs::create_dir_all(image.join("share/man/man1")));
Expand Down

0 comments on commit 417bdc7

Please sign in to comment.