rather than try to make _clean-broken-gcc explicitly a prerequisite o…

…f spkg targets

just ensure it is always run/checked in the build/make/install script

it also needs to run as a prerequisite of base-toolchain

build/make/deps

@@ -47,7 +47,7 @@ all-build: toolchain-deps
 # During the toolchain build, we export SAGE_BUILD_TOOLCHAIN=yes
 # such that packages can do different things when they are built
 # as prerequisite of GCC.
-base-toolchain: base
+base-toolchain: _clean-broken-gcc base
 	env SAGE_BUILD_TOOLCHAIN=yes $(MAKE) toolchain
 
 # All targets except for the base packages

build/make/install

@@ -44,6 +44,11 @@ if [ -z "$MAKE" ]; then
     export MAKE=make
 fi
 
+# Make the special target _clean-broken-gcc before trying to build any other
+# packages.  This is necessary if configure detected a broken GCC installed
+# in Sage; Trac #25011
+$MAKE _clean-broken-gcc
+
 # If "make" doesn't understand the -q option (although we require
 # GNU make, which supports it), it should exit with a non-zero status
 # which is not a problem.

build/pkgs/gcc/dependencies

@@ -1,4 +1,4 @@
-_clean-broken-gcc | $(MP_LIBRARY) mpfr mpc zlib xz
+| $(MP_LIBRARY) mpfr mpc zlib xz
 
 ------------------------------------------------------------------------
 NOTE: all dependencies of GCC must be order-only dependencies

m4/sage_spkg_collect.m4

@@ -58,10 +58,6 @@ AC_DEFUN_ONCE([SAGE_SPKG_COLLECT], [
 # See https://trac.sagemath.org/ticket/24703
 if test x$SAGE_INSTALL_GCC = xexists; then
     SAGE_GCC_DEP='$(SAGE_LOCAL)/bin/gcc'
-elif test x$SAGE_INSTALL_GCC = xyes; then
-    # GCC should be installed *or* there as in existing installation that
-    # is broken and should be removed.
-    SAGE_GCC_DEP='_clean-broken-gcc'
 else
     SAGE_GCC_DEP=''
 fi