commit:     57d2235b3ecfad50f717c6aa5f625385266cd955
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 23 09:13:41 2025 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Jan 23 09:13:41 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57d2235b

sys-libs/glibc: Fix cross-compiling glibc when clang is selected

Was accidentally dropped in -r8

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 sys-libs/glibc/glibc-2.40-r8.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-libs/glibc/glibc-2.40-r8.ebuild 
b/sys-libs/glibc/glibc-2.40-r8.ebuild
index a04a45bd8cbf..181d92fc3d5b 100644
--- a/sys-libs/glibc/glibc-2.40-r8.ebuild
+++ b/sys-libs/glibc/glibc-2.40-r8.ebuild
@@ -609,13 +609,13 @@ setup_env() {
                # Last, we need the settings of the *build* environment, not of 
the
                # target environment...
 
-               local current_binutils_path=$(env ROOT="${BROOT}" 
binutils-config -B)
+               local current_binutils_path=$(env CHOST="${CBUILD}" 
ROOT="${BROOT}" binutils-config -B "${CTARGET}")
                local current_gcc_path=$(env ROOT="${BROOT}" gcc-config -B)
                einfo "Overriding clang configuration, since it won't work here"
 
-               export CC="${current_gcc_path}/gcc"
-               export CPP="${current_gcc_path}/cpp"
-               export CXX="${current_gcc_path}/g++"
+               export CC="${current_gcc_path}/${CTARGET}-gcc"
+               export CPP="${current_gcc_path}/${CTARGET}-cpp"
+               export CXX="${current_gcc_path}/${CTARGET}-g++"
                export LD="${current_binutils_path}/ld.bfd"
                export AR="${current_binutils_path}/ar"
                export AS="${current_binutils_path}/as"

Reply via email to