From 4e995247a9a9d45f0b265ab9120c6d31c0a1f0d9 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 14 Apr 2025 08:45:05 +0100
Subject: gentoo auto-resync : 14:04:2025 - 08:45:05

---
 eclass/Manifest.gz      | Bin 40341 -> 40345 bytes
 eclass/llvm-r2.eclass   |   4 ++--
 eclass/rust.eclass      |   4 ++--
 eclass/toolchain.eclass |   5 ++++-
 4 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'eclass')

diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 68b3459306f4..d402575513ab 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/llvm-r2.eclass b/eclass/llvm-r2.eclass
index 4dda9aedc7c6..5370e5dbd8d5 100644
--- a/eclass/llvm-r2.eclass
+++ b/eclass/llvm-r2.eclass
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: llvm-r2.eclass
@@ -54,7 +54,7 @@ esac
 if [[ -z ${_LLVM_R2_ECLASS} ]]; then
 _LLVM_R2_ECLASS=1
 
-inherit llvm-utils
+inherit llvm-utils multilib
 
 # == internal control knobs ==
 
diff --git a/eclass/rust.eclass b/eclass/rust.eclass
index ae590284db33..a9ccfed4cf8f 100644
--- a/eclass/rust.eclass
+++ b/eclass/rust.eclass
@@ -68,7 +68,7 @@ fi
 # Definitive list of Rust slots and the associated LLVM slot, newest first.
 declare -A -g -r _RUST_LLVM_MAP=(
 	["9999"]=20
-	["1.86"]=19
+	["1.86.0"]=19
 	["1.85.1"]=19
 	["1.85.0"]=19
 	["1.84.1"]=19
@@ -94,7 +94,7 @@ declare -A -g -r _RUST_LLVM_MAP=(
 # this array is used to store the Rust slots in a more convenient order for iteration.
 declare -a -g -r _RUST_SLOTS_ORDERED=(
 	"9999"
-	"1.86"
+	"1.86.0"
 	"1.85.1"
 	"1.85.0"
 	"1.84.1"
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 273a2b9f92c9..b6cc4df5364a 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1921,10 +1921,13 @@ toolchain_src_configure() {
 			# respect USE=graphite here in case the user passes some
 			# graphite flags rather than try strip them out.
 			$(use_with graphite isl)
-			$(use_with zstd)
 			--with-system-zlib
 		)
 
+		if tc_has_feature zstd ; then
+			confgcc_jit+=( $(use_with zstd) )
+		fi
+
 		if tc_version_is_at_least 15.0.0_pre20241124 ${PV} ; then
 			confgcc_jit+=( $(use_enable libgdiagnostics) )
 		fi
-- 
cgit v1.2.3