Fix inclusion of `wasm-component-ld` in dist artifacts
authorAlex Crichton <alex@alexcrichton.com>
Mon, 22 Jul 2024 14:57:53 +0000 (07:57 -0700)
committerFabian Grünbichler <debian@fabian.gruenbichler.email>
Tue, 8 Oct 2024 12:34:41 +0000 (14:34 +0200)
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

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

index 550d88c8f713ddc0873b804815b0f0122fb3954d..a91361ee737a7feb2557cf5b3bf067f867935188 100644 (file)
@@ -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")));