commit:     4be734dc69b6c3f20f25342be45d9c7d7e16f0cf
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 10 09:17:10 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 10 09:18:26 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4be734dc

toolchain.eclass: support GDCFLAGS

Bug: https://bugs.gentoo.org/940470
Bug: https://bugs.gentoo.org/940750
Bug: https://gcc.gnu.org/PR116975
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 bf883c5370fc..933292d6ee2a 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -2325,6 +2325,8 @@ gcc_do_make() {
                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}"}
+               # Default to CFLAGS for GDCFLAGS if unset
+               STAGE1_GDCFLAGS=${STAGE1_GDCFLAGS-"$(get_abi_CFLAGS 
${TARGET_DEFAULT_ABI}) ${CFLAGS}"}
                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}"}
@@ -2342,6 +2344,7 @@ gcc_do_make() {
                emakeargs+=(
                        STAGE1_CFLAGS="${STAGE1_CFLAGS}"
                        STAGE1_CXXFLAGS="${STAGE1_CXXFLAGS}"
+                       STAGE1_GDCFLAGS="${STAGE1_GDCFLAGS}"
                        STAGE1_LDFLAGS="${STAGE1_LDFLAGS}"
                        BOOT_CFLAGS="${BOOT_CFLAGS}"
                        BOOT_LDFLAGS="${BOOT_LDFLAGS}"

Reply via email to