From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 602901584AD for ; Sun, 20 Apr 2025 08:12:55 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 45DD734311D for ; Sun, 20 Apr 2025 08:12:55 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id C59301104B7; Sun, 20 Apr 2025 08:12:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id BB8201104B7 for ; Sun, 20 Apr 2025 08:12:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6D8CD3430A1 for ; Sun, 20 Apr 2025 08:12:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9DA402408 for ; Sun, 20 Apr 2025 08:12:46 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1745136021.e04826591046b92f5a3fcd2f1d0f31c42f78b2d2.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/rust/rust-1.84.0-r1.ebuild dev-lang/rust/rust-1.84.1-r1.ebuild dev-lang/rust/rust-1.85.0-r1.ebuild dev-lang/rust/rust-1.85.0.ebuild dev-lang/rust/rust-1.85.1.ebuild dev-lang/rust/rust-1.86.0-r1.ebuild dev-lang/rust/rust-9999.ebuild X-VCS-Directories: dev-lang/rust/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e04826591046b92f5a3fcd2f1d0f31c42f78b2d2 X-VCS-Branch: master Date: Sun, 20 Apr 2025 08:12:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 34eb84b6-66e6-4503-95bb-55cf866fb218 X-Archives-Hash: b6695e7e67b0aed2f3839a384acef505 commit: e04826591046b92f5a3fcd2f1d0f31c42f78b2d2 Author: blackteahamburger outlook com> AuthorDate: Sun Mar 30 07:51:13 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sun Apr 20 08:00:21 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0482659 dev-lang/rust: allow building with mold Closes: https://bugs.gentoo.org/952925 Signed-off-by: blackteahamburger outlook.com> Closes: https://github.com/gentoo/gentoo/pull/41387 Signed-off-by: Sam James gentoo.org> dev-lang/rust/rust-1.84.0-r1.ebuild | 11 ++++++++--- dev-lang/rust/rust-1.84.1-r1.ebuild | 11 ++++++++--- dev-lang/rust/rust-1.85.0-r1.ebuild | 11 ++++++++--- dev-lang/rust/rust-1.85.0.ebuild | 11 ++++++++--- dev-lang/rust/rust-1.85.1.ebuild | 11 ++++++++--- dev-lang/rust/rust-1.86.0-r1.ebuild | 11 ++++++++--- dev-lang/rust/rust-9999.ebuild | 11 ++++++++--- 7 files changed, 56 insertions(+), 21 deletions(-) diff --git a/dev-lang/rust/rust-1.84.0-r1.ebuild b/dev-lang/rust/rust-1.84.0-r1.ebuild index 2afcbad6227d..2f7c5664f3e4 100644 --- a/dev-lang/rust/rust-1.84.0-r1.ebuild +++ b/dev-lang/rust/rust-1.84.0-r1.ebuild @@ -68,7 +68,12 @@ BDEPEND="${PYTHON_DEPS} >=sys-devel/gcc-4.7[cxx] >=llvm-core/clang-3.5 ) - lto? ( system-llvm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) ) + lto? ( system-llvm? ( + || ( + $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') + sys-devel/mold + ) + ) ) !system-llvm? ( >=dev-build/cmake-3.13.4 app-alternatives/ninja @@ -235,7 +240,7 @@ src_prepare() { fi fi - if use lto && tc-is-clang && ! tc-ld-is-lld; then + if use lto && tc-is-clang && ! tc-ld-is-lld && ! tc-ld-is-mold; then export RUSTFLAGS+=" -C link-arg=-fuse-ld=lld" fi @@ -391,7 +396,7 @@ src_configure() { dist-src = false remap-debuginfo = true lld = $(usex system-llvm false $(toml_usex wasm)) - $(if use lto && tc-is-clang ; then + $(if use lto && tc-is-clang && ! tc-ld-is-mold; then echo "use-lld = true" fi) # only deny warnings if doc+wasm are NOT requested, documenting stage0 wasm std fails without it diff --git a/dev-lang/rust/rust-1.84.1-r1.ebuild b/dev-lang/rust/rust-1.84.1-r1.ebuild index c98855304342..42a9b6dd7222 100644 --- a/dev-lang/rust/rust-1.84.1-r1.ebuild +++ b/dev-lang/rust/rust-1.84.1-r1.ebuild @@ -68,7 +68,12 @@ BDEPEND="${PYTHON_DEPS} >=sys-devel/gcc-4.7[cxx] >=llvm-core/clang-3.5 ) - lto? ( system-llvm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) ) + lto? ( system-llvm? ( + || ( + $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') + sys-devel/mold + ) + ) ) !system-llvm? ( >=dev-build/cmake-3.13.4 app-alternatives/ninja @@ -235,7 +240,7 @@ src_prepare() { fi fi - if use lto && tc-is-clang && ! tc-ld-is-lld; then + if use lto && tc-is-clang && ! tc-ld-is-lld && ! tc-ld-is-mold; then export RUSTFLAGS+=" -C link-arg=-fuse-ld=lld" fi @@ -391,7 +396,7 @@ src_configure() { dist-src = false remap-debuginfo = true lld = $(usex system-llvm false $(toml_usex wasm)) - $(if use lto && tc-is-clang ; then + $(if use lto && tc-is-clang && ! tc-ld-is-mold; then echo "use-lld = true" fi) # only deny warnings if doc+wasm are NOT requested, documenting stage0 wasm std fails without it diff --git a/dev-lang/rust/rust-1.85.0-r1.ebuild b/dev-lang/rust/rust-1.85.0-r1.ebuild index 87c6951a5371..5106720d515c 100644 --- a/dev-lang/rust/rust-1.85.0-r1.ebuild +++ b/dev-lang/rust/rust-1.85.0-r1.ebuild @@ -94,7 +94,12 @@ BDEPEND="${PYTHON_DEPS} >=sys-devel/gcc-4.7[cxx] >=llvm-core/clang-3.5 ) - lto? ( system-llvm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) ) + lto? ( system-llvm? ( + || ( + $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') + sys-devel/mold + ) + ) ) !system-llvm? ( >=dev-build/cmake-3.13.4 app-alternatives/ninja @@ -307,7 +312,7 @@ src_prepare() { fi fi - if use lto && tc-is-clang && ! tc-ld-is-lld; then + if use lto && tc-is-clang && ! tc-ld-is-lld && ! tc-ld-is-mold; then export RUSTFLAGS+=" -C link-arg=-fuse-ld=lld" fi @@ -478,7 +483,7 @@ src_configure() { dist-src = false remap-debuginfo = true lld = $(usex system-llvm false $(toml_usex wasm)) - $(if use lto && tc-is-clang ; then + $(if use lto && tc-is-clang && ! tc-ld-is-mold; then echo "use-lld = true" fi) # only deny warnings if doc+wasm are NOT requested, documenting stage0 wasm std fails without it diff --git a/dev-lang/rust/rust-1.85.0.ebuild b/dev-lang/rust/rust-1.85.0.ebuild index cdcb5e650413..11784aed91a5 100644 --- a/dev-lang/rust/rust-1.85.0.ebuild +++ b/dev-lang/rust/rust-1.85.0.ebuild @@ -94,7 +94,12 @@ BDEPEND="${PYTHON_DEPS} >=sys-devel/gcc-4.7[cxx] >=llvm-core/clang-3.5 ) - lto? ( system-llvm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) ) + lto? ( system-llvm? ( + || ( + $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') + sys-devel/mold + ) + ) ) !system-llvm? ( >=dev-build/cmake-3.13.4 app-alternatives/ninja @@ -306,7 +311,7 @@ src_prepare() { fi fi - if use lto && tc-is-clang && ! tc-ld-is-lld; then + if use lto && tc-is-clang && ! tc-ld-is-lld && ! tc-ld-is-mold; then export RUSTFLAGS+=" -C link-arg=-fuse-ld=lld" fi @@ -477,7 +482,7 @@ src_configure() { dist-src = false remap-debuginfo = true lld = $(usex system-llvm false $(toml_usex wasm)) - $(if use lto && tc-is-clang ; then + $(if use lto && tc-is-clang && ! tc-ld-is-mold; then echo "use-lld = true" fi) # only deny warnings if doc+wasm are NOT requested, documenting stage0 wasm std fails without it diff --git a/dev-lang/rust/rust-1.85.1.ebuild b/dev-lang/rust/rust-1.85.1.ebuild index 9b72f12ce71a..5b1296ec9547 100644 --- a/dev-lang/rust/rust-1.85.1.ebuild +++ b/dev-lang/rust/rust-1.85.1.ebuild @@ -94,7 +94,12 @@ BDEPEND="${PYTHON_DEPS} >=sys-devel/gcc-4.7[cxx] >=llvm-core/clang-3.5 ) - lto? ( system-llvm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) ) + lto? ( system-llvm? ( + || ( + $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') + sys-devel/mold + ) + ) ) !system-llvm? ( >=dev-build/cmake-3.13.4 app-alternatives/ninja @@ -307,7 +312,7 @@ src_prepare() { fi fi - if use lto && tc-is-clang && ! tc-ld-is-lld; then + if use lto && tc-is-clang && ! tc-ld-is-lld && ! tc-ld-is-mold; then export RUSTFLAGS+=" -C link-arg=-fuse-ld=lld" fi @@ -478,7 +483,7 @@ src_configure() { dist-src = false remap-debuginfo = true lld = $(usex system-llvm false $(toml_usex wasm)) - $(if use lto && tc-is-clang ; then + $(if use lto && tc-is-clang && ! tc-ld-is-mold; then echo "use-lld = true" fi) # only deny warnings if doc+wasm are NOT requested, documenting stage0 wasm std fails without it diff --git a/dev-lang/rust/rust-1.86.0-r1.ebuild b/dev-lang/rust/rust-1.86.0-r1.ebuild index a5a82e00ca6a..d949d33bb194 100644 --- a/dev-lang/rust/rust-1.86.0-r1.ebuild +++ b/dev-lang/rust/rust-1.86.0-r1.ebuild @@ -94,7 +94,12 @@ BDEPEND="${PYTHON_DEPS} >=sys-devel/gcc-4.7[cxx] >=llvm-core/clang-3.5 ) - lto? ( system-llvm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) ) + lto? ( system-llvm? ( + || ( + $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') + sys-devel/mold + ) + ) ) !system-llvm? ( >=dev-build/cmake-3.13.4 app-alternatives/ninja @@ -307,7 +312,7 @@ src_prepare() { fi fi - if use lto && tc-is-clang && ! tc-ld-is-lld; then + if use lto && tc-is-clang && ! tc-ld-is-lld && ! tc-ld-is-mold; then export RUSTFLAGS+=" -C link-arg=-fuse-ld=lld" fi @@ -478,7 +483,7 @@ src_configure() { dist-src = false remap-debuginfo = true lld = $(usex system-llvm false $(toml_usex wasm)) - $(if use lto && tc-is-clang ; then + $(if use lto && tc-is-clang && ! tc-ld-is-mold; then echo "use-lld = true" fi) # only deny warnings if doc+wasm are NOT requested, documenting stage0 wasm std fails without it diff --git a/dev-lang/rust/rust-9999.ebuild b/dev-lang/rust/rust-9999.ebuild index 39292c5cb886..bdaabbaded52 100644 --- a/dev-lang/rust/rust-9999.ebuild +++ b/dev-lang/rust/rust-9999.ebuild @@ -94,7 +94,12 @@ BDEPEND="${PYTHON_DEPS} >=sys-devel/gcc-4.7[cxx] >=llvm-core/clang-3.5 ) - lto? ( system-llvm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) ) + lto? ( system-llvm? ( + || ( + $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') + sys-devel/mold + ) + ) ) !system-llvm? ( >=dev-build/cmake-3.13.4 app-alternatives/ninja @@ -307,7 +312,7 @@ src_prepare() { fi fi - if use lto && tc-is-clang && ! tc-ld-is-lld; then + if use lto && tc-is-clang && ! tc-ld-is-lld && ! tc-ld-is-mold; then export RUSTFLAGS+=" -C link-arg=-fuse-ld=lld" fi @@ -479,7 +484,7 @@ src_configure() { dist-src = false remap-debuginfo = true lld = $(usex system-llvm false $(toml_usex wasm)) - $(if use lto && tc-is-clang ; then + $(if use lto && tc-is-clang && ! tc-ld-is-mold; then echo "use-lld = true" fi) # only deny warnings if doc+wasm are NOT requested, documenting stage0 wasm std fails without it