[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/

[Sam James]

commit:     8d34956fa0d01e87961d15214f7ca30fc27154f3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 22 09:54:18 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 22 09:54:57 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d34956f

sys-libs/glibc: use orig CC and friends for compile test w/ binpkgs

See 414f21a6b310ec7d4e0885dd7ac5e379cd49dfe2 again. CC will contain
junk that we want to avoid for this test.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-libs/glibc/glibc-2.41-r8.ebuild | 3 ++-
 sys-libs/glibc/glibc-2.42-r3.ebuild | 3 ++-
 sys-libs/glibc/glibc-9999.ebuild    | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sys-libs/glibc/glibc-2.41-r8.ebuild 
b/sys-libs/glibc/glibc-2.41-r8.ebuild
index 331224630e15..3eaefb0c71b1 100644
--- a/sys-libs/glibc/glibc-2.41-r8.ebuild
+++ b/sys-libs/glibc/glibc-2.41-r8.ebuild
@@ -290,7 +290,8 @@ do_run_test() {
 
        if [[ ${MERGE_TYPE} == "binary" ]] ; then
                # ignore build failures when installing a binary package #324685
-               CFLAGS="-O2" LDFLAGS="" do_compile_test "" "$@" 2>/dev/null || 
return 0
+               CC="${glibc__ORIG_CC}" CXX="${glibc__ORIG_CXX}" 
CPP="${glibc__ORIG_CPP}" \
+                       CFLAGS="-O2" LDFLAGS="" do_compile_test "" "$@" 
2>/dev/null || return 0
        else
                ebegin "Performing simple compile test for ABI=${ABI}"
                if ! do_compile_test "" "$@" ; then

diff --git a/sys-libs/glibc/glibc-2.42-r3.ebuild 
b/sys-libs/glibc/glibc-2.42-r3.ebuild
index cf9e901fc584..257bc27b06e7 100644
--- a/sys-libs/glibc/glibc-2.42-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.42-r3.ebuild
@@ -295,7 +295,8 @@ do_run_test() {
 
        if [[ ${MERGE_TYPE} == "binary" ]] ; then
                # ignore build failures when installing a binary package #324685
-               do_compile_test "" "$@" 2>/dev/null || return 0
+               CC="${glibc__ORIG_CC}" CXX="${glibc__ORIG_CXX}" 
CPP="${glibc__ORIG_CPP}" \
+                       CFLAGS="-O2" LDFLAGS="" do_compile_test "" "$@" 
2>/dev/null || return 0
        else
                ebegin "Performing simple compile test for ABI=${ABI}"
                if ! do_compile_test "" "$@" ; then

diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 390a559cb394..0f471e718cb8 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -297,7 +297,8 @@ do_run_test() {
 
        if [[ ${MERGE_TYPE} == "binary" ]] ; then
                # ignore build failures when installing a binary package #324685
-               CFLAGS="-O2" LDFLAGS="" do_compile_test "" "$@" 2>/dev/null || 
return 0
+               CC="${glibc__ORIG_CC}" CXX="${glibc__ORIG_CXX}" 
CPP="${glibc__ORIG_CPP}" \
+                       CFLAGS="-O2" LDFLAGS="" do_compile_test "" "$@" 
2>/dev/null || return 0
        else
                ebegin "Performing simple compile test for ABI=${ABI}"
                if ! do_compile_test "" "$@" ; then