external/libeot/ExternalProject_libeot.mk | 1 - solenv/gbuild/platform/com_GCC_defs.mk | 4 ---- 2 files changed, 5 deletions(-)
New commits: commit 6fa6599963fb7d5ba411540b181c581bbbeb1e9d Author: Thorsten Behrens <thorsten.behr...@allotropia.de> AuthorDate: Mon Dec 4 13:56:55 2023 +0100 Commit: Thorsten Behrens <thorsten.behr...@allotropia.de> CommitDate: Sun Dec 10 00:37:58 2023 +0100 Remove hard limit to c89 for clang This seems no longer true: "Windows MSVC only supports C90 so force gnu89" With that said, also do a revert: "external/libeot internally uses --std=c99, do not overrule that" This reverts commit 61a66b612eaeeb38d5d9f9aa83326be6b08c1b6f. Change-Id: Id628131b4fa6b61e19da6d862d773ab36f201729 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160454 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de> diff --git a/external/libeot/ExternalProject_libeot.mk b/external/libeot/ExternalProject_libeot.mk index 98c7d2eb403d..6e5f465333cc 100644 --- a/external/libeot/ExternalProject_libeot.mk +++ b/external/libeot/ExternalProject_libeot.mk @@ -23,7 +23,6 @@ $(call gb_ExternalProject_get_state_target,libeot,build) : --enable-static \ --disable-shared \ --disable-debug \ - CFLAGS='$(filter-out -std=gnu89,$(CFLAGS))' \ && $(MAKE) $(if $(verbose),V=1) \ ) $(call gb_Trace_EndRange,libeot,EXTERNAL) diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 7ea7a16461e3..3f50c4089b09 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -186,10 +186,6 @@ gb_CXX03FLAGS := -std=gnu++98 -Wno-long-long \ -Wno-variadic-macros -Wno-deprecated-declarations endif -# On Windows MSVC only supports C90 so force gnu89 (especially in clang) to -# to catch potential gnu89/C90 incompatibilities locally. -gb_CFLAGS_COMMON += -std=gnu89 - ifeq ($(ENABLE_LTO),TRUE) ifeq ($(COM_IS_CLANG),TRUE) gb_LTOFLAGS := -flto=thin