commit: a9156e205ca667cf40f43329b5bc22749f166501 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Sep 30 01:19:35 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Sep 30 01:51:42 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9156e20
toolchain.eclass: pass STAGE1_CXXFLAGS Note that we're reusing get_abi_CFLAGS here as multilib.eclass doesn't have get_abi_CXXFLAGS yet (bug #940501). Adding this for the benefit of some GDC hackery we're doing (bug #940470). Bug: https://bugs.gentoo.org/940501 Signed-off-by: Sam James <sam <AT> gentoo.org> eclass/toolchain.eclass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 138925777dd6..7dc905ecd7d8 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -2023,6 +2023,8 @@ gcc_do_make() { # We only want to use the system's CFLAGS if not building a # cross-compiler. STAGE1_CFLAGS=${STAGE1_CFLAGS-"$(get_abi_CFLAGS ${TARGET_DEFAULT_ABI}) ${CFLAGS}"} + # multilib.eclass lacks get_abi_CXXFLAGS (bug #940501) + STAGE1_CXXFLAGS=${STAGE1_CXXFLAGS-"$(get_abi_CFLAGS ${TARGET_DEFAULT_ABI}) ${CXXFLAGS}"} STAGE1_LDFLAGS=${STAGE1_LDFLAGS-"${abi_ldflags} ${LDFLAGS}"} BOOT_CFLAGS=${BOOT_CFLAGS-"$(get_abi_CFLAGS ${TARGET_DEFAULT_ABI}) ${CFLAGS}"} BOOT_LDFLAGS=${BOOT_LDFLAGS-"${abi_ldflags} ${LDFLAGS}"} @@ -2030,6 +2032,7 @@ gcc_do_make() { emakeargs+=( STAGE1_CFLAGS="${STAGE1_CFLAGS}" + STAGE1_CXXFLAGS="${STAGE1_CXXFLAGS}" STAGE1_LDFLAGS="${STAGE1_LDFLAGS}" BOOT_CFLAGS="${BOOT_CFLAGS}" BOOT_LDFLAGS="${BOOT_LDFLAGS}"
