diff options
| -rw-r--r-- | compilerplugins/Makefile-clang.mk | 2 | ||||
| -rw-r--r-- | config_host.mk.in | 2 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | external/clucene/Makefile | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_defs.mk | 2 |
6 files changed, 6 insertions, 11 deletions
diff --git a/compilerplugins/Makefile-clang.mk b/compilerplugins/Makefile-clang.mk index 1121d32a3da7..b7d821231a8f 100644 --- a/compilerplugins/Makefile-clang.mk +++ b/compilerplugins/Makefile-clang.mk @@ -32,7 +32,7 @@ CLANGOUTDIR=$(BUILDDIR)/compilerplugins/obj QUIET=$(if $(VERBOSE)$(verbose),,@) -ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE) +ifneq ($(ENABLE_WERROR),) CLANGWERROR := -Werror endif diff --git a/config_host.mk.in b/config_host.mk.in index 5f9a751da6d8..2e81fecc2d45 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -170,11 +170,11 @@ export ENABLE_TDEAB=@ENABLE_TDEAB@ export ENABLE_TELEPATHY=@ENABLE_TELEPATHY@ export ENABLE_VALGRIND=@ENABLE_VALGRIND@ export ENABLE_VLC=@ENABLE_VLC@ +export ENABLE_WERROR=@ENABLE_WERROR@ export EPM=@EPM@ export EPM_FLAGS=@EPM_FLAGS@ export ETONYEK_CFLAGS=$(gb_SPACE)@ETONYEK_CFLAGS@ export ETONYEK_LIBS=$(gb_SPACE)@ETONYEK_LIBS@ -export EXTERNAL_WARNINGS_NOT_ERRORS=@EXTERNAL_WARNINGS_NOT_ERRORS@ export debug=@ENABLE_DEBUG@ @x_Cygwin@ export FIND=@WIN_FIND@ export FIREBIRD_CFLAGS=$(gb_SPACE)@FIREBIRD_CFLAGS@ diff --git a/configure.ac b/configure.ac index 55761728347c..9c317cc0a7b2 100644 --- a/configure.ac +++ b/configure.ac @@ -4636,13 +4636,12 @@ dnl Set the ENABLE_WERROR variable. (Activate --enable-werror) dnl =================================================================== AC_MSG_CHECKING([whether to turn warnings to errors]) if test -n "$enable_werror" -a "$enable_werror" != "no"; then - EXTERNAL_WARNINGS_NOT_ERRORS="FALSE" + ENABLE_WERROR="TRUE" AC_MSG_RESULT([yes]) else - EXTERNAL_WARNINGS_NOT_ERRORS="TRUE" AC_MSG_RESULT([no]) fi -AC_SUBST(EXTERNAL_WARNINGS_NOT_ERRORS) +AC_SUBST(ENABLE_WERROR) dnl Set the ASSERT_ALWAYS_ABORT variable. (Activate --enable-assert-always-abort) dnl =================================================================== diff --git a/external/clucene/Makefile b/external/clucene/Makefile index 37fff27cf433..e4968cf85fb6 100644 --- a/external/clucene/Makefile +++ b/external/clucene/Makefile @@ -1,8 +1,4 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# - -EXTERNAL_WARNINGS_NOT_ERRORS := TRUE -export EXTERNAL_WARNINGS_NOT_ERRORS module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index de77c7ba4867..e4c105cf15e2 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -92,7 +92,7 @@ gb_CXXFLAGS_COMMON += -fvisibility-inlines-hidden endif endif -ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE) +ifneq ($(ENABLE_WERROR),) gb_CFLAGS_WERROR := -Werror gb_CXXFLAGS_WERROR := -Werror endif diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index f339609b8de0..9f050e940000 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -244,7 +244,7 @@ gb_PCHWARNINGS = \ gb_STDLIBS := \ advapi32.lib \ -ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE) +ifneq ($(ENABLE_WERROR),) gb_CFLAGS_WERROR := -WX gb_CXXFLAGS_WERROR := -WX endif |