config_host.mk.in | 1 - configure.ac | 9 ++------- external/firebird/UnpackedTarball_firebird.mk | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-)
New commits: commit 4678951770003effbee79207fa3259cbfc162d13 Author: Stephan Bergmann <[email protected]> AuthorDate: Sun Dec 7 18:09:50 2025 +0100 Commit: Andras Timar <[email protected]> CommitDate: Mon Mar 9 12:29:27 2026 +0100 CLANG_16 is always true now ...after f0625d229106bb9c7893ce19e46a1183efe46dbf "Update Clang baseline version check" Change-Id: I00c176fb044e425989fcabf7b3bdb2cf150a6fee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195206 Reviewed-by: Stephan Bergmann <[email protected]> Tested-by: Jenkins (cherry picked from commit fd00573b6c38b974019dbc914d6a08f6b2204648) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201250 Reviewed-by: Andras Timar <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/config_host.mk.in b/config_host.mk.in index 0f242baf106e..35f6db0660d4 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -67,7 +67,6 @@ export CCACHE_DEPEND_MODE=@CCACHE_DEPEND_MODE@ export CDR_CFLAGS=$(gb_SPACE)@CDR_CFLAGS@ export CDR_LIBS=$(gb_SPACE)@CDR_LIBS@ @x_CFLAGS@ export CFLAGS=@CFLAGS@ -export CLANG_16=@CLANG_16@ export CLANG_USE_LD=@CLANG_USE_LD@ export CLANGDIR=@CLANGDIR@ export CLANGLIBDIR=@CLANGLIBDIR@ diff --git a/configure.ac b/configure.ac index 1db640efc7c7..8d3197b07e23 100644 --- a/configure.ac +++ b/configure.ac @@ -4817,7 +4817,6 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ AC_SUBST(COM_IS_CLANG) CLANGVER= -CLANG_16= if test "$COM_IS_CLANG" = TRUE; then AC_MSG_CHECKING([whether Clang is new enough]) AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ @@ -4846,14 +4845,10 @@ if test "$COM_IS_CLANG" = TRUE; then else AC_MSG_ERROR(["$CLANG_FULL_VERSION" is too old or unrecognized, must be at least Clang 18]) fi - if test "$CLANGVER" -ge 160000; then - CLANG_16=TRUE - fi AC_DEFINE_UNQUOTED(CLANG_VERSION,$CLANGVER) AC_DEFINE_UNQUOTED(CLANG_FULL_VERSION,$CLANG_FULL_VERSION) fi fi -AC_SUBST(CLANG_16) SHOWINCLUDES_PREFIX= if test "$_os" = WINNT; then diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk index 79e1da16daee..e0e6308942a5 100644 --- a/external/firebird/UnpackedTarball_firebird.mk +++ b/external/firebird/UnpackedTarball_firebird.mk @@ -79,7 +79,7 @@ endif ifneq ($(filter -fsanitize=%,$(CC)),) $(eval $(call gb_UnpackedTarball_add_patches,firebird, \ external/firebird/sanitizer.patch \ - $(if $(CLANG_16),external/firebird/sanitizer-rtti.patch) \ + external/firebird/sanitizer-rtti.patch \ )) endif commit db8c2a6e48e40c954888997f7c57d69c3756b424 Author: Stephan Bergmann <[email protected]> AuthorDate: Sun Dec 7 18:12:14 2025 +0100 Commit: Andras Timar <[email protected]> CommitDate: Mon Mar 9 12:29:16 2026 +0100 Update Clang baseline version check ...after version bump documented at e8fd52037a3b77e2da95918ff4ba5ed465c2f3bc "Update README.md after Clang bump to 18" Change-Id: If79439fb0f386f3d8f21a6cc6019ae1373e08245 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195197 Reviewed-by: Stephan Bergmann <[email protected]> Tested-by: Jenkins (cherry picked from commit f0625d229106bb9c7893ce19e46a1183efe46dbf) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201249 Reviewed-by: Andras Timar <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/configure.ac b/configure.ac index bda1b620770d..1db640efc7c7 100644 --- a/configure.ac +++ b/configure.ac @@ -4841,10 +4841,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 120000; then + if test "$CLANGVER" -ge 180000; then AC_MSG_RESULT([yes ($clang_version)]) else - AC_MSG_ERROR(["$CLANG_FULL_VERSION" is too old or unrecognized, must be at least Clang 12]) + AC_MSG_ERROR(["$CLANG_FULL_VERSION" is too old or unrecognized, must be at least Clang 18]) fi if test "$CLANGVER" -ge 160000; then CLANG_16=TRUE
