From: David Lamparter Date: Sat, 18 Aug 2018 03:08:19 +0000 (+0200) Subject: build: -Werror does not belong in AM_CPPFLAGS X-Git-Tag: frr-7.1-dev~404^2~6 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=e0597bb2a58b26876f89d24852fd1e037c6cf64d;p=matthieu%2Ffrr.git build: -Werror does not belong in AM_CPPFLAGS (probably neither do the ASAN/... FLAGS, but let's leave that alone.) Also, it was intentional that it's $(WERROR) and not @WERROR@. The former can be overwritten at comandline as "make WERROR=" while the latter can't. Signed-off-by: David Lamparter --- diff --git a/common.am b/common.am index 73f36eed1a..9c0c547811 100644 --- a/common.am +++ b/common.am @@ -2,8 +2,8 @@ # Automake fragment intended to be shared by Makefile.am files in the # tree. When used, should be included at the very top of the file. # -AM_CPPFLAGS = @ASAN_FLAGS@ @TSAN_FLAGS@ @MSAN_FLAGS@ @WERROR@ -AM_CFLAGS = @ASAN_FLAGS@ @TSAN_FLAGS@ @MSAN_FLAGS@ @WERROR@ +AM_CPPFLAGS = @ASAN_FLAGS@ @TSAN_FLAGS@ @MSAN_FLAGS@ +AM_CFLAGS = @ASAN_FLAGS@ @TSAN_FLAGS@ @MSAN_FLAGS@ $(WERROR) AM_V_CLIPPY = $(am__v_CLIPPY_$(V)) am__v_CLIPPY_ = $(am__v_CLIPPY_$(AM_DEFAULT_VERBOSITY))