diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-07-23 19:42:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-23 19:42:37 +0200 |
| commit | 417bdc703663fc0870b78260a01ce5b53393e114 (patch) | |
| tree | ade6449112bfeb85955b81cb258fccf3e25c4954 | |
| parent | f34237f44396bb6ad12514ac7097c59d6eda646f (diff) | |
| parent | c3d3d6fe0295c2521801fc4d0c6afe73e4d1328c (diff) | |
| download | rust-417bdc703663fc0870b78260a01ce5b53393e114.tar.gz rust-417bdc703663fc0870b78260a01ce5b53393e114.zip | |
Rollup merge of #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 #126967 (in addition to #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.
| -rw-r--r-- | src/bootstrap/src/core/build_steps/dist.rs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs index 7d67cc3b36e..649bcdd8733 100644 --- a/src/bootstrap/src/core/build_steps/dist.rs +++ b/src/bootstrap/src/core/build_steps/dist.rs @@ -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"))); |