commit: 30e32d9ed408fd786e9c1e16063c1228d123ebc1 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Wed Apr 10 20:36:37 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Apr 13 18:40:52 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30e32d9e
sys-libs/glibc: export CPP similarily to CC and CXX * This is copies the approach that CC and CXX use, so that the correct abi is used. Otherwise an abi_x86_32 configure test could automagically enable CET which isn't available on abi_x86_32. Bug: https://bugs.gentoo.org/927652 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/36200 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-libs/glibc/glibc-2.39-r2.ebuild | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys-libs/glibc/glibc-2.39-r2.ebuild b/sys-libs/glibc/glibc-2.39-r2.ebuild index 236484af1eeb..7624666b6723 100644 --- a/sys-libs/glibc/glibc-2.39-r2.ebuild +++ b/sys-libs/glibc/glibc-2.39-r2.ebuild @@ -589,10 +589,12 @@ setup_env() { # Reset CC and CXX to the value at start of emerge export CC=${glibc__ORIG_CC:-${CC:-$(tc-getCC ${CTARGET})}} export CXX=${glibc__ORIG_CXX:-${CXX:-$(tc-getCXX ${CTARGET})}} + export CPP=${glibc__ORIG_CPP:-${CPP:-$(tc-getCPP ${CTARGET})}} # and make sure glibc__ORIG_CC and glibc__ORIG_CXX is defined now. export glibc__ORIG_CC=${CC} export glibc__ORIG_CXX=${CXX} + export glibc__ORIG_CPP="${CPP}" if tc-is-clang && ! use custom-cflags && ! is_crosscompile ; then export glibc__force_gcc=yes @@ -641,6 +643,7 @@ setup_env() { export CC="$(tc-getCC ${CTARGET})" export CXX="$(tc-getCXX ${CTARGET})" + export CPP="$(tc-getCPP ${CTARGET})" # Always use tuple-prefixed toolchain. For non-native ABI glibc's configure # can't detect them automatically due to ${CHOST} mismatch and fallbacks @@ -657,6 +660,7 @@ setup_env() { # acts on CC?) export glibc__GLIBC_CC=${CC} export glibc__GLIBC_CXX=${CXX} + export glibc__GLIBC_CPP=${CPP} export glibc__abi_CFLAGS="$(get_abi_CFLAGS)" @@ -672,6 +676,8 @@ setup_env() { # Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548 export CXX="${glibc__GLIBC_CXX} ${glibc__abi_CFLAGS} ${CFLAGS}" + export CPP="${glibc__GLIBC_CPP} ${glibc__abi_CFLAGS}" + if is_crosscompile; then # Assume worst-case bootstrap: glibc is built for the first time # with ${CTARGET}-g++ not available yet. We avoid
