From 86391f9d78f79ca1b037a80a32401d81b941876f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Feb 2025 07:07:36 +0000 Subject: [PATCH] eclass/go-env: Sync with Gentoo It's from Gentoo commit 90cadf879253a7ef6b439f7a51809f0b0b835693. --- .../third_party/portage-stable/eclass/go-env.eclass | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/go-env.eclass b/sdk_container/src/third_party/portage-stable/eclass/go-env.eclass index 11fdf943e7..b2b240b5ef 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/go-env.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/go-env.eclass @@ -1,4 +1,4 @@ -# Copyright 2023-2024 Gentoo Authors +# Copyright 2023-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: go-env.eclass @@ -40,7 +40,13 @@ go-env_set_compile_environment() { use x86 && export GO386=$(go-env_go386) # XXX: Hack for checking ICE (bug #912152, gcc PR113204) - has_version -b "sys-devel/gcc[debug]" && filter-lto + if tc-is-gcc ; then + # For either USE=debug or an unreleased compiler, non-default + # checking will trigger. + if has_version -b "sys-devel/gcc[debug]" || [[ $(gcc-minor-version) -eq 0 ]] ; then + filter-lto + fi + fi export CGO_CFLAGS="${CGO_CFLAGS:-$CFLAGS}" export CGO_CPPFLAGS="${CGO_CPPFLAGS:-$CPPFLAGS}"