[gentoo-commits] proj/rust-patches:1.86.0-r2-1 commit in: /

["Matt Jolly" <kangie@gentoo.org>]

commit:     05e5a2093ac8d4d9a0f77b97f960cffe0a492673
Author:     Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 29 06:18:31 2025 +0000
Commit:     Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Tue Jul 29 06:39:23 2025 +0000
URL:        https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=05e5a209

Add 1.86.0 linker flags fix

This was committed to ::gentoo; it should have ended up here.

Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>

 1.86.0-fix-hardcoded-gnu-linker-flags.patch | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/1.86.0-fix-hardcoded-gnu-linker-flags.patch b/1.86.0-fix-hardcoded-gnu-linker-flags.patch
new file mode 100644
index 0000000..e3adf9f
--- /dev/null
+++ b/1.86.0-fix-hardcoded-gnu-linker-flags.patch
@@ -0,0 +1,19 @@
+https://github.com/rust-lang/rust/commit/bad6b7bad6491790184c42579b9bacdbd580dd3e
+See-also: https://bugs.gentoo.org/953956
+--- a/src/bootstrap/src/utils/helpers.rs
++++ b/src/bootstrap/src/utils/helpers.rs
+@@ -451,12 +451,12 @@
+     if !builder.is_lld_direct_linker(target) && builder.config.lld_mode.is_used() {
+         match builder.config.lld_mode {
+             LldMode::External => {
+-                args.push("-Clinker-flavor=gnu-lld-cc".to_string());
++                args.push("-Zlinker-features=+lld".to_string());
+                 // FIXME(kobzol): remove this flag once MCP510 gets stabilized
+                 args.push("-Zunstable-options".to_string());
+             }
+             LldMode::SelfContained => {
+-                args.push("-Clinker-flavor=gnu-lld-cc".to_string());
++                args.push("-Zlinker-features=+lld".to_string());
+                 args.push("-Clink-self-contained=+linker".to_string());
+                 // FIXME(kobzol): remove this flag once MCP510 gets stabilized
+                 args.push("-Zunstable-options".to_string());