From e96f7c79b513f3d2d4e1134b20c85e0a3c126cb4 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:13:25 +0200 Subject: Merging debian version 1.66.0+dfsg1-1. Signed-off-by: Daniel Baumann --- debian/patches/d-rustc-add-soname.patch | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'debian/patches/d-rustc-add-soname.patch') diff --git a/debian/patches/d-rustc-add-soname.patch b/debian/patches/d-rustc-add-soname.patch index e69898bf5..277f431d2 100644 --- a/debian/patches/d-rustc-add-soname.patch +++ b/debian/patches/d-rustc-add-soname.patch @@ -24,17 +24,15 @@ using a GNU linker). compiler/rustc_codegen_ssa/src/back/link.rs | 7 +++++++ 1 file changed, 7 insertions(+) -diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs -index 04ec1e7..67296ca 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs -@@ -2240,6 +2240,13 @@ fn add_order_independent_options( +@@ -2280,6 +2280,13 @@ } add_rpath_args(cmd, sess, codegen_results, out_filename); + + if (crate_type == config::CrateType::Dylib || crate_type == config::CrateType::Cdylib) -+ && sess.target.linker_is_gnu { ++ && sess.target.linker_flavor.is_gnu() { + let filename = String::from(out_filename.file_name().unwrap().to_str().unwrap()); + let soname = [String::from("-Wl,-soname=") + &filename]; + cmd.args(&soname); -- cgit v1.2.3