From 032a5ac8ac2af81974aa6ae4fa2e114e80b9e9e9 Mon Sep 17 00:00:00 2001 From: ru Date: Sun, 11 Jan 2004 10:29:55 +0000 Subject: Put the warning flags to where they belong (into CWARNFLAGS). This allows us to easily override them when necessary, e.g., to selectively disable warnings in libc/ contributed sources. --- share/mk/bsd.sys.mk | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'share') diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index e966ff8..d473079 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -11,28 +11,28 @@ .if !defined(NO_WARNS) . if defined(WARNS) . if ${WARNS} > 0 -CFLAGS += -Wsystem-headers +CWARNFLAGS += -Wsystem-headers . if !defined(NO_WERROR) -CFLAGS += -Werror +CWARNFLAGS += -Werror . endif . endif . if ${WARNS} > 1 -CFLAGS += -Wall -Wno-format-y2k +CWARNFLAGS += -Wall -Wno-format-y2k . endif . if ${WARNS} > 2 -CFLAGS += -W -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith +CWARNFLAGS += -W -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith . endif . if ${WARNS} > 3 -CFLAGS += -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-align +CWARNFLAGS += -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-align . endif # BDECFLAGS . if ${WARNS} > 5 -CFLAGS += -Wbad-function-cast -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls +CWARNFLAGS += -Wbad-function-cast -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls . endif . if ${WARNS} > 1 && ${WARNS} < 5 # XXX Delete -Wuninitialized by default for now -- the compiler doesn't # XXX always get it right. -CFLAGS += -Wno-uninitialized +CWARNFLAGS += -Wno-uninitialized . endif . endif @@ -41,10 +41,10 @@ WFORMAT = 1 . endif . if defined(WFORMAT) . if ${WFORMAT} > 0 -#CFLAGS += -Wformat-nonliteral -Wformat-security -Wno-format-extra-args -CFLAGS += -Wformat=2 -Wno-format-extra-args +#CWARNFLAGS += -Wformat-nonliteral -Wformat-security -Wno-format-extra-args +CWARNFLAGS += -Wformat=2 -Wno-format-extra-args . if !defined(NO_WERROR) -CFLAGS += -Werror +CWARNFLAGS += -Werror . endif . endif . endif -- cgit v1.1