Skip to content

Commit 0cc272d

Browse files
authored
Unrolled build for rust-lang#128060
Rollup merge of rust-lang#128060 - alexcrichton:include-wasm-component-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.
2 parents 84c257e + c3d3d6f commit 0cc272d

File tree

1 file changed

+5
-0
lines changed
  • src/bootstrap/src/core/build_steps

1 file changed

+5
-0
lines changed

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

+5
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,11 @@ impl Step for Rustc {
472472
);
473473
}
474474
}
475+
if builder.build_wasm_component_ld() {
476+
let src_dir = builder.sysroot_libdir(compiler, host).parent().unwrap().join("bin");
477+
let ld = exe("wasm-component-ld", compiler.host);
478+
builder.copy_link(&src_dir.join(&ld), &dst_dir.join(&ld));
479+
}
475480

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

0 commit comments

Comments
 (0)