From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 22 Jul 2024 14:57:53 +0000 (-0700)
Subject: Fix inclusion of `wasm-component-ld` in dist artifacts
X-Git-Tag: archive/raspbian/1.81.0+dfsg1-2+rpi1~1^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e0903c4a4f2a193d02cc61c596ccd6bd2dfbd552;p=rustc.git

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.

(cherry picked from commit c3d3d6fe0295c2521801fc4d0c6afe73e4d1328c)

Forwarded: https://github.com/rust-lang/rust/pull/128060

Gbp-Pq: Topic upstream
Gbp-Pq: Name Fix-inclusion-of-wasm-component-ld-in-dist-artifacts.patch
---

diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs
index 550d88c8f7..a91361ee73 100644
--- a/src/bootstrap/src/core/build_steps/dist.rs
+++ b/src/bootstrap/src/core/build_steps/dist.rs
@@ -473,6 +473,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")));