From cf459fc35c2947077d05292e0a763c78587060c6 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Sat, 31 May 2003 16:37:22 +0000
Subject: [PATCH] CSTD is virtually worthless for WARNS=2-5.  Return -pedantic
 to WARNS=6+.

---
 share/mk/bsd.sys.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index f32f980ff32e..6d40e80210a8 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -21,7 +21,6 @@ CFLAGS		+=	-std=iso9899:1999
 .  else
 CFLAGS		+=	-std=${CSTD}
 .  endif
-CFLAGS		+=	-pedantic
 . endif
 . if defined(WARNS)
 .  if ${WARNS} > 0
@@ -41,6 +40,9 @@ CFLAGS		+=	-Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-al
 .  endif
 # BDECFLAGS
 .  if ${WARNS} > 5
+.   if defined(CSTD)
+CFLAGS		+=	-pedantic
+.   endif
 CFLAGS		+=	-Wbad-function-cast -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls
 .  endif
 .  if ${WARNS} > 1 && ${WARNS} < 5