configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
New commits: commit 6ef2d358ac053ce0f6de9cf0f8f25e8bae66d441 Author: Stephan Bergmann <[email protected]> AuthorDate: Sat Sep 23 08:44:52 2023 +0300 Commit: Stephan Bergmann <[email protected]> CommitDate: Sat Sep 23 23:43:08 2023 +0200 Adapt Clang and GCC minimum version checks ...that were missing from 02f48a32400f81413329d81203c417521882cab6 "Adjust for new linux baseline" Change-Id: I3e204107239612595bfac0d1f9d4c4d6a6900f81 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157176 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/configure.ac b/configure.ac index 6595593d3d1b..93e6bd11bfca 100644 --- a/configure.ac +++ b/configure.ac @@ -4444,10 +4444,10 @@ if test "$COM_IS_CLANG" = TRUE; then CLANG_FULL_VERSION=`echo __clang_version__ | $CC $my_args -` CLANGVER=`echo $clang_version \ | $AWK -F. '{ print \$1*10000+(\$2<100?\$2:99)*100+(\$3<100?\$3:99) }'` - if test "$CLANGVER" -ge 80001; then + if test "$CLANGVER" -ge 120000; then AC_MSG_RESULT([yes ($clang_version)]) else - AC_MSG_ERROR(["$CLANG_FULL_VERSION" is too old or unrecognized, must be at least Clang 8.0.1]) + AC_MSG_ERROR(["$CLANG_FULL_VERSION" is too old or unrecognized, must be at least Clang 12]) fi AC_DEFINE_UNQUOTED(CLANG_VERSION,$CLANGVER) AC_DEFINE_UNQUOTED(CLANG_FULL_VERSION,$CLANG_FULL_VERSION) @@ -4547,8 +4547,8 @@ if test "$GCC" = "yes" -a -z "$COM_IS_CLANG"; then AC_MSG_RESULT([gcc $_gcc_version ($gcc_full_version)]) - if test "$gcc_full_version" -lt 70000; then - AC_MSG_ERROR([GCC $_gcc_version is too old, must be at least GCC 7.0.0]) + if test "$gcc_full_version" -lt 120000; then + AC_MSG_ERROR([GCC $_gcc_version is too old, must be at least GCC 12]) fi else # Explicitly force GCC_VERSION to be empty, even for Clang, to check incorrect uses.
