Kaydet (Commit) 193d1527 authored tarafından Matúš Kukan's avatar Matúš Kukan

EXTERNAL_WARNINGS_NOT_ERRORS -> ENABLE_WERROR and be "TRUE"/""

It's easier to type 'make ENABLE_WERROR= <module>' if one wants that.

Change-Id: I2bb9911259f41ecae27dc110723f3364b3ff09cf
üst 6c6e798d
...@@ -32,7 +32,7 @@ CLANGOUTDIR=$(BUILDDIR)/compilerplugins/obj ...@@ -32,7 +32,7 @@ CLANGOUTDIR=$(BUILDDIR)/compilerplugins/obj
QUIET=$(if $(VERBOSE)$(verbose),,@) QUIET=$(if $(VERBOSE)$(verbose),,@)
ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE) ifneq ($(ENABLE_WERROR),)
CLANGWERROR := -Werror CLANGWERROR := -Werror
endif endif
......
...@@ -170,11 +170,11 @@ export ENABLE_TDEAB=@ENABLE_TDEAB@ ...@@ -170,11 +170,11 @@ export ENABLE_TDEAB=@ENABLE_TDEAB@
export ENABLE_TELEPATHY=@ENABLE_TELEPATHY@ export ENABLE_TELEPATHY=@ENABLE_TELEPATHY@
export ENABLE_VALGRIND=@ENABLE_VALGRIND@ export ENABLE_VALGRIND=@ENABLE_VALGRIND@
export ENABLE_VLC=@ENABLE_VLC@ export ENABLE_VLC=@ENABLE_VLC@
export ENABLE_WERROR=@ENABLE_WERROR@
export EPM=@EPM@ export EPM=@EPM@
export EPM_FLAGS=@EPM_FLAGS@ export EPM_FLAGS=@EPM_FLAGS@
export ETONYEK_CFLAGS=$(gb_SPACE)@ETONYEK_CFLAGS@ export ETONYEK_CFLAGS=$(gb_SPACE)@ETONYEK_CFLAGS@
export ETONYEK_LIBS=$(gb_SPACE)@ETONYEK_LIBS@ export ETONYEK_LIBS=$(gb_SPACE)@ETONYEK_LIBS@
export EXTERNAL_WARNINGS_NOT_ERRORS=@EXTERNAL_WARNINGS_NOT_ERRORS@
export debug=@ENABLE_DEBUG@ export debug=@ENABLE_DEBUG@
@x_Cygwin@ export FIND=@WIN_FIND@ @x_Cygwin@ export FIND=@WIN_FIND@
export FIREBIRD_CFLAGS=$(gb_SPACE)@FIREBIRD_CFLAGS@ export FIREBIRD_CFLAGS=$(gb_SPACE)@FIREBIRD_CFLAGS@
......
...@@ -4636,13 +4636,12 @@ dnl Set the ENABLE_WERROR variable. (Activate --enable-werror) ...@@ -4636,13 +4636,12 @@ dnl Set the ENABLE_WERROR variable. (Activate --enable-werror)
dnl =================================================================== dnl ===================================================================
AC_MSG_CHECKING([whether to turn warnings to errors]) AC_MSG_CHECKING([whether to turn warnings to errors])
if test -n "$enable_werror" -a "$enable_werror" != "no"; then if test -n "$enable_werror" -a "$enable_werror" != "no"; then
EXTERNAL_WARNINGS_NOT_ERRORS="FALSE" ENABLE_WERROR="TRUE"
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
else else
EXTERNAL_WARNINGS_NOT_ERRORS="TRUE"
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
AC_SUBST(EXTERNAL_WARNINGS_NOT_ERRORS) AC_SUBST(ENABLE_WERROR)
dnl Set the ASSERT_ALWAYS_ABORT variable. (Activate --enable-assert-always-abort) dnl Set the ASSERT_ALWAYS_ABORT variable. (Activate --enable-assert-always-abort)
dnl =================================================================== dnl ===================================================================
......
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # -*- 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)))) module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
......
...@@ -92,7 +92,7 @@ gb_CXXFLAGS_COMMON += -fvisibility-inlines-hidden ...@@ -92,7 +92,7 @@ gb_CXXFLAGS_COMMON += -fvisibility-inlines-hidden
endif endif
endif endif
ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE) ifneq ($(ENABLE_WERROR),)
gb_CFLAGS_WERROR := -Werror gb_CFLAGS_WERROR := -Werror
gb_CXXFLAGS_WERROR := -Werror gb_CXXFLAGS_WERROR := -Werror
endif endif
......
...@@ -244,7 +244,7 @@ gb_PCHWARNINGS = \ ...@@ -244,7 +244,7 @@ gb_PCHWARNINGS = \
gb_STDLIBS := \ gb_STDLIBS := \
advapi32.lib \ advapi32.lib \
ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE) ifneq ($(ENABLE_WERROR),)
gb_CFLAGS_WERROR := -WX gb_CFLAGS_WERROR := -WX
gb_CXXFLAGS_WERROR := -WX gb_CXXFLAGS_WERROR := -WX
endif endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment