commit:     353ebe9e9280cf39f510d142a06bd58d57451de0
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Wed Feb 18 22:31:47 2026 +0000
Commit:     orbea <orbea <AT> riseup <DOT> net>
CommitDate: Wed Feb 18 22:31:47 2026 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=353ebe9e

dev-lang/rust: sync ::gentoo

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

 dev-lang/rust/rust-1.90.0-r1.ebuild    |  8 +++++++-
 dev-lang/rust/rust-1.91.0.ebuild       | 10 ++++++++--
 dev-lang/rust/rust-1.92.0_p1-r1.ebuild | 25 +++++++++++++++++++++++--
 3 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/dev-lang/rust/rust-1.90.0-r1.ebuild 
b/dev-lang/rust/rust-1.90.0-r1.ebuild
index 14d1495..78c326c 100644
--- a/dev-lang/rust/rust-1.90.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.90.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -652,6 +652,12 @@ src_configure() {
                                musl-root = "$(${cross_toolchain}-gcc 
-print-sysroot)/usr"
                        _EOF_
                fi
+               if [[ "${cross_rust_target}" == *-uefi ]]; then
+                       # Profiler is not supported on bare-metal
+                       cat <<- _EOF_ >> "${S}"/bootstrap.toml
+                               profiler = false
+                       _EOF_
+               fi
 
                # append cross target to "normal" target list
                # example 'target = ["powerpc64le-unknown-linux-gnu"]'

diff --git a/dev-lang/rust/rust-1.91.0.ebuild b/dev-lang/rust/rust-1.91.0.ebuild
index 3615a31..26d2da2 100644
--- a/dev-lang/rust/rust-1.91.0.ebuild
+++ b/dev-lang/rust/rust-1.91.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -72,7 +72,7 @@ ALL_RUST_SYSROOTS=( 
"${ALL_RUST_SYSROOTS[@]/#/rust_sysroots_}" )
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="${PV%%_*}" # Beta releases get to share the same SLOT as the eventual 
stable
 
-IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto 
rustfmt rust-analyzer rust-src system-llvm test ${ALL_LLVM_TARGETS[*]} 
${ALL_RUST_SYSROOTS[*]}"
+IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto 
rustfmt rust-analyzer rust-src +system-llvm test ${ALL_LLVM_TARGETS[*]} 
${ALL_RUST_SYSROOTS[*]}"
 
 if [[ ${PV} = *9999* ]]; then
        # These USE flags require nightly rust
@@ -647,6 +647,12 @@ src_configure() {
                                musl-root = "$(${cross_toolchain}-gcc 
-print-sysroot)/usr"
                        _EOF_
                fi
+               if [[ "${cross_rust_target}" == *-uefi ]]; then
+                       # Profiler is not supported on bare-metal
+                       cat <<- _EOF_ >> "${S}"/bootstrap.toml
+                               profiler = false
+                       _EOF_
+               fi
 
                # append cross target to "normal" target list
                # example 'target = ["powerpc64le-unknown-linux-gnu"]'

diff --git a/dev-lang/rust/rust-1.92.0_p1-r1.ebuild 
b/dev-lang/rust/rust-1.92.0_p1-r1.ebuild
index 5945692..4f5ff30 100644
--- a/dev-lang/rust/rust-1.92.0_p1-r1.ebuild
+++ b/dev-lang/rust/rust-1.92.0_p1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -125,6 +125,7 @@ BDEPEND="
                        sys-devel/mold
                )
        ) )
+       rust_sysroots_wasm? ( llvm-core/clang )
        !system-llvm? (
                >=dev-build/cmake-3.13.4
                app-alternatives/ninja
@@ -598,9 +599,23 @@ src_configure() {
        done
        if use rust_sysroots_wasm; then
                wasm_target="wasm32-unknown-unknown"
-               export CFLAGS_${wasm_target//-/_}="$(filter-flags '-mcpu*' 
'-march*' '-mtune*'; echo "$CFLAGS")"
+               if tc-is-clang; then
+                       local wasm_cc=$(tc-getCC)
+                       local wasm_cxx=$(tc-getCXX)
+               else
+                       local wasm_cc=${CHOST}-clang
+                       local wasm_cxx=${CHOST}-clang++
+               fi
+               export CFLAGS_${wasm_target//-/_}="$(
+                       CC="${wasm_cc} --target=wasm32-unknown-unknown"
+                       filter-flags '-mcpu*' '-march*' '-mtune*'
+                       strip-unsupported-flags
+                       echo "${CFLAGS}"
+               )"
                cat <<- _EOF_ >> "${S}"/bootstrap.toml
                        [target.wasm32-unknown-unknown]
+                       cc = "${wasm_cc}"
+                       cxx = "${wasm_cxx}"
                        linker = "$(usex system-llvm lld rust-lld)"
                        # wasm target does not have profiler_builtins 
https://bugs.gentoo.org/848483
                        profiler = false
@@ -665,6 +680,12 @@ src_configure() {
                                musl-root = "$(${cross_toolchain}-gcc 
-print-sysroot)/usr"
                        _EOF_
                fi
+               if [[ "${cross_rust_target}" == *-uefi ]]; then
+                       # Profiler is not supported on bare-metal
+                       cat <<- _EOF_ >> "${S}"/bootstrap.toml
+                               profiler = false
+                       _EOF_
+               fi
 
                # append cross target to "normal" target list
                # example 'target = ["powerpc64le-unknown-linux-gnu"]'

Reply via email to