Revert "toolchain.eclass: allow fixincludes for >= GCC 13"

This reverts commit 4505e063f64a7539222d0ccb224f6fa6b1832fc8.

Didn't mean to push yet.

Signed-off-by: Sam James <sam@gentoo.org>

1 files changed, 10 insertions, 14 deletions

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 3a673e161f4d..71342765c78e 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1975,20 +1975,16 @@ toolchain_src_install() {
 		fi
 	done
 
-	# Re-enable fixincludes for >= GCC 13
-	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=107128
-	if [[ ${GCCMAJOR} -lt 13 ]] ; then
-		# We remove the generated fixincludes, as they can cause things to break
-		# (ncurses, openssl, etc).  We do not prevent them from being built, as
-		# in the following commit which we revert:
-		# https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.647&r2=1.648
-		# This is because bsd userland needs fixedincludes to build gcc, while
-		# linux does not.  Both can dispose of them afterwards.
-		while read x ; do
-			grep -q 'It has been auto-edited by fixincludes from' "${x}" \
-				&& rm -f "${x}"
-		done < <(find gcc/include*/ -name '*.h')
-	fi
+	# We remove the generated fixincludes, as they can cause things to break
+	# (ncurses, openssl, etc).  We do not prevent them from being built, as
+	# in the following commit which we revert:
+	# https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.647&r2=1.648
+	# This is because bsd userland needs fixedincludes to build gcc, while
+	# linux does not.  Both can dispose of them afterwards.
+	while read x ; do
+		grep -q 'It has been auto-edited by fixincludes from' "${x}" \
+			&& rm -f "${x}"
+	done < <(find gcc/include*/ -name '*.h')
 
 	if is_jit ; then
 		# See https://gcc.gnu.org/onlinedocs/gcc-11.3.0/jit/internals/index.html#packaging-notes