--- jdk21u-jdk-21.0.3-ga/make/autoconf/toolchain.m4.vanilla	2024-08-02 21:54:57.657019892 +0200
+++ jdk21u-jdk-21.0.3-ga/make/autoconf/toolchain.m4	2024-08-02 21:57:16.250020327 +0200
@@ -451,7 +451,7 @@
     #     warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     COMPILER_VERSION_OUTPUT=`$COMPILER --version 2>&1`
     # Check that this is likely to be GCC.
-    $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "Free Software Foundation" > /dev/null
+    $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "." > /dev/null
     if test $? -ne 0; then
       AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler.])
       AC_MSG_NOTICE([The result from running with --version was: "$COMPILER_VERSION"])
@@ -473,7 +473,7 @@
     #    Thread model: posix
     COMPILER_VERSION_OUTPUT=`$COMPILER --version 2>&1`
     # Check that this is likely to be clang
-    $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "clang" > /dev/null
+    $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "." > /dev/null
     if test $? -ne 0; then
       AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler.])
       AC_MSG_NOTICE([The result from running with --version was: "$COMPILER_VERSION_OUTPUT"])