commit:     d0d87a54bb3bb7b077c75b44ff419177fc03ebb8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 30 01:22:34 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 30 01:51:43 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0d87a54

toolchain.eclass: check CXXFLAGS too in -march=native sanity check

Bug: https://bugs.gentoo.org/904426
Thanks-to: Pacho Ramos <pacho <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/toolchain.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 616bc01a840a..d6445ea3227e 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1812,7 +1812,7 @@ gcc_do_filter_flags() {
        declare -A l1_cache_sizes=()
        # Workaround for inconsistent cache sizes on hybrid P/E cores
        # See PR111768 (and bug #904426, bug #908523, and bug #915389)
-       if [[ ${CBUILD} == @(x86_64|i?86)* ]] && [[ ${CFLAGS} == 
*-march=native* ]] && tc-is-gcc ; then
+       if [[ ${CBUILD} == @(x86_64|i?86)* ]] && [[ "${CFLAGS}${CXXFLAGS}" == 
*-march=native* ]] && tc-is-gcc ; then
                local x
                local l1_cache_size
                # Iterate over all cores and find their L1 cache size

Reply via email to