From 70778df59bfb349cd488a406dfceef16f7659f2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Tue, 21 Jan 2025 11:35:40 +0100 Subject: [PATCH] rust-llvm: ship symlink to llvm-objcopy instead of copy of binary MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler --- debian/not-installed | 3 +++ debian/rust-llvm.install | 1 - debian/rust-llvm.links | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/not-installed b/debian/not-installed index 6bc5b6cf45..dc6ebbe131 100644 --- a/debian/not-installed +++ b/debian/not-installed @@ -8,6 +8,9 @@ usr/lib/rustlib/uninstall.sh # redundant copy of llvm-dwp, we already link it in rustc.links usr/lib/rustlib/*/bin/rust-llvm-dwp +# redundant copy of llvm-objcopy, we already link it in rustc.links +usr/lib/rustlib/*/bin/rust-objcopy + # docs, we already install into /usr/share/doc/rustc usr/share/doc/docs/* diff --git a/debian/rust-llvm.install b/debian/rust-llvm.install index e3bb41ce27..5a80ed18b5 100644 --- a/debian/rust-llvm.install +++ b/debian/rust-llvm.install @@ -1,2 +1 @@ usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/wasm-component-ld -usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/rust-objcopy diff --git a/debian/rust-llvm.links b/debian/rust-llvm.links index 628d269c11..6bb2c3a5eb 100644 --- a/debian/rust-llvm.links +++ b/debian/rust-llvm.links @@ -4,6 +4,11 @@ usr/bin/llvm-dwp-19 usr/bin/rust-llvm-dwp # for -Z gcc-ld=lld, see compiler/rustc_codegen_ssa/src/back/link.rs for logic usr/bin/rust-lld usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/gcc-ld/ld usr/bin/rust-lld usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/gcc-ld/ld64 + +# instead of shipping the one copied by bootstrap, which would be for the wrong +# architecture in case of a cross build anyway +usr/bin/llvm-objcopy-19 usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/rust-objcopy + # For applications that use cargo-binutils, e.g. grcov usr/bin/llvm-profdata-19 usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/llvm-profdata usr/bin/llvm-cov-19 usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/llvm-cov