From owner-svn-src-all@FreeBSD.ORG  Fri Dec 23 13:50:34 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 70CB8106566B;
	Fri, 23 Dec 2011 13:50:34 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5B4C58FC0A;
	Fri, 23 Dec 2011 13:50:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBNDoYg3068092;
	Fri, 23 Dec 2011 13:50:34 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBNDoYZW068090;
	Fri, 23 Dec 2011 13:50:34 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201112231350.pBNDoYZW068090@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 23 Dec 2011 13:50:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228841 - head/sys/conf
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Dec 2011 13:50:34 -0000

Author: dim
Date: Fri Dec 23 13:50:33 2011
New Revision: 228841
URL: http://svn.freebsd.org/changeset/base/228841

Log:
  Amend r228822 by not directly adding to CWARNFLAGS, but to an optional
  CWARNEXTRA variable, which gets included into the initial CWARNFLAGS
  setting.  This makes it easier to override CWARNFLAGS with completely
  custom settings (including enabling any disabled warnings).
  
  Reminded by:	arundel
  MFC after:	1 week

Modified:
  head/sys/conf/kern.mk

Modified: head/sys/conf/kern.mk
==============================================================================
--- head/sys/conf/kern.mk	Fri Dec 23 13:20:51 2011	(r228840)
+++ head/sys/conf/kern.mk	Fri Dec 23 13:50:33 2011	(r228841)
@@ -6,7 +6,8 @@
 CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
 		-Wundef -Wno-pointer-sign -fformat-extensions \
-		-Wmissing-include-dirs -fdiagnostics-show-option
+		-Wmissing-include-dirs -fdiagnostics-show-option \
+		${CWARNEXTRA}
 #
 # The following flags are next up for working on:
 #	-Wextra
@@ -22,7 +23,7 @@ NO_WSHIFT_COUNT_OVERFLOW=	-Wno-shift-cou
 # Several other warnings which might be useful in some cases, but not severe
 # enough to error out the whole kernel build.  Display them anyway, so there is
 # some incentive to fix them eventually.
-CWARNFLAGS+=	-Wno-error-tautological-compare
+CWARNEXTRA+=	-Wno-error-tautological-compare
 .endif
 
 #