From 80ea6e6ea87f4685ceff45cd13dd00d644688cac Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 16 Mar 2024 06:48:32 +0000
Subject: gentoo auto-resync : 16:03:2024 - 06:48:31

---
 eclass/Manifest.gz   | Bin 39617 -> 39622 bytes
 eclass/go-env.eclass |   9 ++++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'eclass')

diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 6dfe399fc667..73ea7ee45e65 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/go-env.eclass b/eclass/go-env.eclass
index 1f950db06930..baba0d3ee8b3 100644
--- a/eclass/go-env.eclass
+++ b/eclass/go-env.eclass
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: go-env.eclass
@@ -14,7 +14,7 @@
 if [[ -z ${_GO_ENV_ECLASS} ]]; then
 _GO_ENV_ECLASS=1
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 # @FUNCTION: go-env_set_compile_environment
 # @DESCRIPTION:
@@ -27,12 +27,15 @@ inherit toolchain-funcs
 # (e.g. "emerge-aarch64-cross-linux-gnu foo" run on x86_64 will emerge "foo" for x86_64
 #  instead of aarch64)
 go-env_set_compile_environment() {
-	tc-export CC CXX
+	tc-export CC CXX PKG_CONFIG
 
 	export GOARCH="$(go-env_goarch)"
 	use arm && export GOARM=$(go-env_goarm)
 	use x86 && export GO386=$(go-env_go386)
 
+	# XXX: Hack for checking ICE (bug #912152, gcc PR113204)
+	[[ $(gcc-fullversion) == 14.0.1 ]] && filter-lto
+
 	export CGO_CFLAGS="${CGO_CFLAGS:-$CFLAGS}"
 	export CGO_CPPFLAGS="${CGO_CPPFLAGS:-$CPPFLAGS}"
 	export CGO_CXXFLAGS="${CGO_CXXFLAGS:-$CXXFLAGS}"
-- 
cgit v1.2.3