public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Joonas Niilola" <juippis@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust/, dev-lang/rust/files/
Date: Tue, 10 Jun 2025 17:19:07 +0000 (UTC)	[thread overview]
Message-ID: <1749575887.9dd4853cd6c55934e3b13a019be3d62fe5c6d1ea.juippis@gentoo> (raw)

commit:     9dd4853cd6c55934e3b13a019be3d62fe5c6d1ea
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 10 17:18:07 2025 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jun 10 17:18:07 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dd4853c

dev-lang/rust: fix building '+wasm' on clang/lld system on 1.86.0

Closes: https://bugs.gentoo.org/953956
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 ...372-bgo-953956-fix-hardcoded-gnu-linker-flags.patch | 18 ++++++++++++++++++
 dev-lang/rust/rust-1.86.0-r2.ebuild                    |  2 ++
 2 files changed, 20 insertions(+)

diff --git a/dev-lang/rust/files/rust-1.86.0-issue-139372-bgo-953956-fix-hardcoded-gnu-linker-flags.patch b/dev-lang/rust/files/rust-1.86.0-issue-139372-bgo-953956-fix-hardcoded-gnu-linker-flags.patch
new file mode 100644
index 000000000000..11d7738f2ee1
--- /dev/null
+++ b/dev-lang/rust/files/rust-1.86.0-issue-139372-bgo-953956-fix-hardcoded-gnu-linker-flags.patch
@@ -0,0 +1,18 @@
+diff '--color=auto' -Nuar rustc-1.86.0-src.orig/src/bootstrap/src/utils/helpers.rs rustc-1.86.0-src/src/bootstrap/src/utils/helpers.rs
+--- rustc-1.86.0-src.orig/src/bootstrap/src/utils/helpers.rs	2025-03-31 22:37:24.000000000 +0100
++++ rustc-1.86.0-src/src/bootstrap/src/utils/helpers.rs	2025-04-17 12:31:37.651607535 +0100
+@@ -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());

diff --git a/dev-lang/rust/rust-1.86.0-r2.ebuild b/dev-lang/rust/rust-1.86.0-r2.ebuild
index 9ca6ee0b6b79..e15141928083 100644
--- a/dev-lang/rust/rust-1.86.0-r2.ebuild
+++ b/dev-lang/rust/rust-1.86.0-r2.ebuild
@@ -316,6 +316,8 @@ src_prepare() {
 	fi
 
 	default
+
+	eapply "${FILESDIR}"/rust-1.86.0-issue-139372-bgo-953956-fix-hardcoded-gnu-linker-flags.patch
 }
 
 src_configure() {


             reply	other threads:[~2025-06-10 17:19 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-06-10 17:19 Joonas Niilola [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-06-03 21:38 [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust/, dev-lang/rust/files/ Matt Jolly
2025-05-17 15:08 Sam James
2025-04-23 11:37 Matt Jolly
2024-12-08  7:04 Sam James
2024-11-03  6:06 Matt Jolly
2024-07-04  1:15 Sam James
2024-05-31 21:03 Sam James
2024-03-09  2:56 WANG Xuerui
2024-02-10  7:49 Sam James
2024-02-10  4:49 Sam James
2024-01-31 13:56 Matt Turner
2023-07-20  9:49 WANG Xuerui
2023-06-20 19:51 Georgy Yakovlev
2023-06-02  3:06 Georgy Yakovlev
2023-03-21  0:10 Georgy Yakovlev
2023-02-08 22:36 Georgy Yakovlev
2023-01-28 19:34 Georgy Yakovlev
2022-12-20  7:12 Georgy Yakovlev
2022-11-05  5:57 Georgy Yakovlev
2022-09-25  6:37 Georgy Yakovlev
2022-09-13 22:59 Georgy Yakovlev
2022-05-26 16:36 Georgy Yakovlev
2022-05-25 21:09 Georgy Yakovlev
2022-05-24 19:44 Georgy Yakovlev
2022-01-29 17:07 Georgy Yakovlev
2021-12-26  8:58 Georgy Yakovlev
2021-09-13 15:07 Georgy Yakovlev
2021-07-03  7:03 Georgy Yakovlev
2021-06-18  5:26 Georgy Yakovlev
2021-05-05 20:16 Georgy Yakovlev
2021-04-27 11:55 Georgy Yakovlev
2021-04-18 10:30 Georgy Yakovlev
2021-02-05 19:31 Georgy Yakovlev
2021-02-02 23:52 Georgy Yakovlev
2020-10-12  5:14 Georgy Yakovlev
2020-10-09  6:24 Georgy Yakovlev
2020-07-31  9:34 Georgy Yakovlev
2020-04-25  6:13 Georgy Yakovlev
2020-03-30 22:23 Georgy Yakovlev
2020-02-05  9:01 Georgy Yakovlev
2019-12-30  9:59 Georgy Yakovlev
2019-12-20  0:53 Georgy Yakovlev
2019-12-20  0:53 Georgy Yakovlev
2019-10-02 18:42 Georgy Yakovlev
2019-08-16  5:45 Georgy Yakovlev
2019-07-09 16:49 Georgy Yakovlev
2019-07-08 23:01 Georgy Yakovlev
2019-04-12  5:08 Georgy Yakovlev
2019-02-19  1:24 Thomas Deutschmann
2019-02-01  4:36 Georgy Yakovlev
2019-01-26  3:50 Georgy Yakovlev
2019-01-19 20:28 Thomas Deutschmann
2018-11-14 16:16 Dirkjan Ochtman
2018-05-14 14:41 Dirkjan Ochtman
2018-01-27 13:24 Dirkjan Ochtman
2016-11-08 18:44 Doug Goldstein

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1749575887.9dd4853cd6c55934e3b13a019be3d62fe5c6d1ea.juippis@gentoo \
    --to=juippis@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox