commit:     232e97960873ea40f6df3e25e52bea8443e45bbf
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Sat Mar 22 19:54:56 2025 +0000
Commit:     orbea <orbea <AT> riseup <DOT> net>
CommitDate: Sat Mar 22 19:54:56 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=232e9796

dev-lang/rust: sync ::gentoo

Signed-off-by: orbea <orbea <AT> riseup.net>

 dev-lang/rust/rust-1.71.1-r101.ebuild |  2 +-
 dev-lang/rust/rust-1.74.1-r101.ebuild |  2 +-
 dev-lang/rust/rust-1.75.0-r101.ebuild |  2 +-
 dev-lang/rust/rust-1.76.0-r101.ebuild |  2 +-
 dev-lang/rust/rust-1.77.1-r101.ebuild |  2 +-
 dev-lang/rust/rust-1.78.0-r101.ebuild |  2 +-
 dev-lang/rust/rust-1.79.0-r101.ebuild |  2 +-
 dev-lang/rust/rust-1.80.1-r101.ebuild |  2 +-
 dev-lang/rust/rust-1.81.0-r101.ebuild |  2 +-
 dev-lang/rust/rust-1.82.0-r102.ebuild |  2 +-
 dev-lang/rust/rust-1.83.0-r2.ebuild   |  2 +-
 dev-lang/rust/rust-1.84.1-r1.ebuild   | 10 +++++++++-
 dev-lang/rust/rust-1.85.0-r1.ebuild   | 10 +++++++++-
 dev-lang/rust/rust-1.85.0.ebuild      | 10 +++++++++-
 14 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/dev-lang/rust/rust-1.71.1-r101.ebuild 
b/dev-lang/rust/rust-1.71.1-r101.ebuild
index 5cb2313..2598f19 100644
--- a/dev-lang/rust/rust-1.71.1-r101.ebuild
+++ b/dev-lang/rust/rust-1.71.1-r101.ebuild
@@ -346,7 +346,7 @@ src_configure() {
                debuginfo-level-tests = 0
                backtrace = true
                incremental = false
-               default-linker = "$(tc-getCC)"
+               default-linker = "${CHOST}-cc"
                parallel-compiler = $(toml_usex parallel-compiler)
                channel = "$(usex nightly nightly stable)"
                description = "gentoo"

diff --git a/dev-lang/rust/rust-1.74.1-r101.ebuild 
b/dev-lang/rust/rust-1.74.1-r101.ebuild
index ca86027..e7102b7 100644
--- a/dev-lang/rust/rust-1.74.1-r101.ebuild
+++ b/dev-lang/rust/rust-1.74.1-r101.ebuild
@@ -408,7 +408,7 @@ src_configure() {
                backtrace = true
                incremental = false
                $(if ! tc-is-cross-compiler; then
-                       echo "default-linker = \"$(tc-getCC)\""
+                       echo "default-linker = \"${CHOST}-cc\""
                fi)
                parallel-compiler = $(toml_usex parallel-compiler)
                channel = "$(usex nightly nightly stable)"

diff --git a/dev-lang/rust/rust-1.75.0-r101.ebuild 
b/dev-lang/rust/rust-1.75.0-r101.ebuild
index ea3ad95..cb523cb 100644
--- a/dev-lang/rust/rust-1.75.0-r101.ebuild
+++ b/dev-lang/rust/rust-1.75.0-r101.ebuild
@@ -377,7 +377,7 @@ src_configure() {
                backtrace = true
                incremental = false
                $(if ! tc-is-cross-compiler; then
-                       echo "default-linker = \"$(tc-getCC)\""
+                       echo "default-linker = \"${CHOST}-cc\""
                fi)
                parallel-compiler = $(toml_usex parallel-compiler)
                channel = "$(usex nightly nightly stable)"

diff --git a/dev-lang/rust/rust-1.76.0-r101.ebuild 
b/dev-lang/rust/rust-1.76.0-r101.ebuild
index 1fafe74..9d6874a 100644
--- a/dev-lang/rust/rust-1.76.0-r101.ebuild
+++ b/dev-lang/rust/rust-1.76.0-r101.ebuild
@@ -377,7 +377,7 @@ src_configure() {
                backtrace = true
                incremental = false
                $(if ! tc-is-cross-compiler; then
-                       echo "default-linker = \"$(tc-getCC)\""
+                       echo "default-linker = \"${CHOST}-cc\""
                fi)
                parallel-compiler = $(toml_usex parallel-compiler)
                channel = "$(usex nightly nightly stable)"

diff --git a/dev-lang/rust/rust-1.77.1-r101.ebuild 
b/dev-lang/rust/rust-1.77.1-r101.ebuild
index d834c65..7309e27 100644
--- a/dev-lang/rust/rust-1.77.1-r101.ebuild
+++ b/dev-lang/rust/rust-1.77.1-r101.ebuild
@@ -376,7 +376,7 @@ src_configure() {
                backtrace = true
                incremental = false
                $(if ! tc-is-cross-compiler; then
-                       echo "default-linker = \"$(tc-getCC)\""
+                       echo "default-linker = \"${CHOST}-cc\""
                fi)
                parallel-compiler = $(toml_usex parallel-compiler)
                channel = "$(usex nightly nightly stable)"

diff --git a/dev-lang/rust/rust-1.78.0-r101.ebuild 
b/dev-lang/rust/rust-1.78.0-r101.ebuild
index 984ce3e..0860559 100644
--- a/dev-lang/rust/rust-1.78.0-r101.ebuild
+++ b/dev-lang/rust/rust-1.78.0-r101.ebuild
@@ -375,7 +375,7 @@ src_configure() {
                backtrace = true
                incremental = false
                $(if ! tc-is-cross-compiler; then
-                       echo "default-linker = \"$(tc-getCC)\""
+                       echo "default-linker = \"${CHOST}-cc\""
                fi)
                parallel-compiler = $(toml_usex parallel-compiler)
                channel = "$(usex nightly nightly stable)"

diff --git a/dev-lang/rust/rust-1.79.0-r101.ebuild 
b/dev-lang/rust/rust-1.79.0-r101.ebuild
index 6f8e118..030dac5 100644
--- a/dev-lang/rust/rust-1.79.0-r101.ebuild
+++ b/dev-lang/rust/rust-1.79.0-r101.ebuild
@@ -375,7 +375,7 @@ src_configure() {
                backtrace = true
                incremental = false
                $(if ! tc-is-cross-compiler; then
-                       echo "default-linker = \"$(tc-getCC)\""
+                       echo "default-linker = \"${CHOST}-cc\""
                fi)
                parallel-compiler = $(toml_usex parallel-compiler)
                channel = "$(usex nightly nightly stable)"

diff --git a/dev-lang/rust/rust-1.80.1-r101.ebuild 
b/dev-lang/rust/rust-1.80.1-r101.ebuild
index ebdba51..00862f4 100644
--- a/dev-lang/rust/rust-1.80.1-r101.ebuild
+++ b/dev-lang/rust/rust-1.80.1-r101.ebuild
@@ -374,7 +374,7 @@ src_configure() {
                backtrace = true
                incremental = false
                $(if ! tc-is-cross-compiler; then
-                       echo "default-linker = \"$(tc-getCC)\""
+                       echo "default-linker = \"${CHOST}-cc\""
                fi)
                parallel-compiler = $(toml_usex parallel-compiler)
                channel = "$(usex nightly nightly stable)"

diff --git a/dev-lang/rust/rust-1.81.0-r101.ebuild 
b/dev-lang/rust/rust-1.81.0-r101.ebuild
index 0ecadce..97c29ed 100644
--- a/dev-lang/rust/rust-1.81.0-r101.ebuild
+++ b/dev-lang/rust/rust-1.81.0-r101.ebuild
@@ -378,7 +378,7 @@ src_configure() {
                backtrace = true
                incremental = false
                $(if ! tc-is-cross-compiler; then
-                       echo "default-linker = \"$(tc-getCC)\""
+                       echo "default-linker = \"${CHOST}-cc\""
                fi)
                parallel-compiler = $(toml_usex parallel-compiler)
                channel = "$(usex nightly nightly stable)"

diff --git a/dev-lang/rust/rust-1.82.0-r102.ebuild 
b/dev-lang/rust/rust-1.82.0-r102.ebuild
index 459735c..064785e 100644
--- a/dev-lang/rust/rust-1.82.0-r102.ebuild
+++ b/dev-lang/rust/rust-1.82.0-r102.ebuild
@@ -383,7 +383,7 @@ src_configure() {
                backtrace = true
                incremental = false
                $(if ! tc-is-cross-compiler; then
-                       echo "default-linker = \"$(tc-getCC)\""
+                       echo "default-linker = \"${CHOST}-cc\""
                fi)
                parallel-compiler = $(toml_usex parallel-compiler)
                channel = "$(usex nightly nightly stable)"

diff --git a/dev-lang/rust/rust-1.83.0-r2.ebuild 
b/dev-lang/rust/rust-1.83.0-r2.ebuild
index 1896488..eaea651 100644
--- a/dev-lang/rust/rust-1.83.0-r2.ebuild
+++ b/dev-lang/rust/rust-1.83.0-r2.ebuild
@@ -385,7 +385,7 @@ src_configure() {
                backtrace = true
                incremental = false
                $(if ! tc-is-cross-compiler; then
-                       echo "default-linker = \"$(tc-getCC)\""
+                       echo "default-linker = \"${CHOST}-cc\""
                fi)
                parallel-compiler = $(toml_usex parallel-compiler)
                channel = "$(usex nightly nightly stable)"

diff --git a/dev-lang/rust/rust-1.84.1-r1.ebuild 
b/dev-lang/rust/rust-1.84.1-r1.ebuild
index c1471e3..98e799f 100644
--- a/dev-lang/rust/rust-1.84.1-r1.ebuild
+++ b/dev-lang/rust/rust-1.84.1-r1.ebuild
@@ -68,6 +68,7 @@ BDEPEND="${PYTHON_DEPS}
                >=sys-devel/gcc-4.7[cxx]
                >=llvm-core/clang-3.5
        )
+       lto? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )
        !system-llvm? (
                >=dev-build/cmake-3.13.4
                app-alternatives/ninja
@@ -246,6 +247,10 @@ src_prepare() {
                fi
        fi
 
+       if use lto && tc-is-clang && ! tc-ld-is-lld; then
+               export RUSTFLAGS+=" -C link-arg=-fuse-ld=lld"
+       fi
+
        default
 }
 
@@ -386,7 +391,7 @@ src_configure() {
                backtrace = true
                incremental = false
                $(if ! tc-is-cross-compiler; then
-                       echo "default-linker = \"$(tc-getCC)\""
+                       echo "default-linker = \"${CHOST}-cc\""
                fi)
                parallel-compiler = $(toml_usex parallel-compiler)
                channel = "$(usex nightly nightly stable)"
@@ -398,6 +403,9 @@ src_configure() {
                dist-src = false
                remap-debuginfo = true
                lld = $(usex system-llvm false $(toml_usex wasm))
+               $(if use lto && tc-is-clang ; then
+                       echo "use-lld = true"
+               fi)
                # only deny warnings if doc+wasm are NOT requested, documenting 
stage0 wasm std fails without it
                # https://github.com/rust-lang/rust/issues/74976
                # https://github.com/rust-lang/rust/issues/76526

diff --git a/dev-lang/rust/rust-1.85.0-r1.ebuild 
b/dev-lang/rust/rust-1.85.0-r1.ebuild
index c7cd012..d31c762 100644
--- a/dev-lang/rust/rust-1.85.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.85.0-r1.ebuild
@@ -94,6 +94,7 @@ BDEPEND="${PYTHON_DEPS}
                >=sys-devel/gcc-4.7[cxx]
                >=llvm-core/clang-3.5
        )
+       lto? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )
        !system-llvm? (
                >=dev-build/cmake-3.13.4
                app-alternatives/ninja
@@ -318,6 +319,10 @@ src_prepare() {
                fi
        fi
 
+       if use lto && tc-is-clang && ! tc-ld-is-lld; then
+               export RUSTFLAGS+=" -C link-arg=-fuse-ld=lld"
+       fi
+
        default
 }
 
@@ -474,7 +479,7 @@ src_configure() {
                backtrace = true
                incremental = false
                $(if ! tc-is-cross-compiler; then
-                       echo "default-linker = \"$(tc-getCC)\""
+                       echo "default-linker = \"${CHOST}-cc\""
                fi)
                channel = "${build_channel}"
                description = "gentoo"
@@ -485,6 +490,9 @@ src_configure() {
                dist-src = false
                remap-debuginfo = true
                lld = $(usex system-llvm false $(toml_usex wasm))
+               $(if use lto && tc-is-clang ; then
+                       echo "use-lld = true"
+               fi)
                # only deny warnings if doc+wasm are NOT requested, documenting 
stage0 wasm std fails without it
                # https://github.com/rust-lang/rust/issues/74976
                # https://github.com/rust-lang/rust/issues/76526

diff --git a/dev-lang/rust/rust-1.85.0.ebuild b/dev-lang/rust/rust-1.85.0.ebuild
index d9afa2e..97b5256 100644
--- a/dev-lang/rust/rust-1.85.0.ebuild
+++ b/dev-lang/rust/rust-1.85.0.ebuild
@@ -94,6 +94,7 @@ BDEPEND="${PYTHON_DEPS}
                >=sys-devel/gcc-4.7[cxx]
                >=llvm-core/clang-3.5
        )
+       lto? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )
        !system-llvm? (
                >=dev-build/cmake-3.13.4
                app-alternatives/ninja
@@ -317,6 +318,10 @@ src_prepare() {
                fi
        fi
 
+       if use lto && tc-is-clang && ! tc-ld-is-lld; then
+               export RUSTFLAGS+=" -C link-arg=-fuse-ld=lld"
+       fi
+
        default
 }
 
@@ -473,7 +478,7 @@ src_configure() {
                backtrace = true
                incremental = false
                $(if ! tc-is-cross-compiler; then
-                       echo "default-linker = \"$(tc-getCC)\""
+                       echo "default-linker = \"${CHOST}-cc\""
                fi)
                channel = "${build_channel}"
                description = "gentoo"
@@ -484,6 +489,9 @@ src_configure() {
                dist-src = false
                remap-debuginfo = true
                lld = $(usex system-llvm false $(toml_usex wasm))
+               $(if use lto && tc-is-clang ; then
+                       echo "use-lld = true"
+               fi)
                # only deny warnings if doc+wasm are NOT requested, documenting 
stage0 wasm std fails without it
                # https://github.com/rust-lang/rust/issues/74976
                # https://github.com/rust-lang/rust/issues/76526

Reply via email to