From owner-svn-src-head@FreeBSD.ORG  Thu Jul 22 21:31:35 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D5056106564A;
	Thu, 22 Jul 2010 21:31:35 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C541E8FC14;
	Thu, 22 Jul 2010 21:31:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6MLVZ0A069038;
	Thu, 22 Jul 2010 21:31:35 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6MLVZtd069037;
	Thu, 22 Jul 2010 21:31:35 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <201007222131.o6MLVZtd069037@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Thu, 22 Jul 2010 21:31:35 +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: r210394 - head/sys/conf
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jul 2010 21:31:35 -0000

Author: rpaulo
Date: Thu Jul 22 21:31:35 2010
New Revision: 210394
URL: http://svn.freebsd.org/changeset/base/210394

Log:
  Fix previous commit: don't remove the WERROR definition when using
  clang.
  
  Submitted by:	Dimitry Andric <dimitry at andric.com>
  Reviewed by:	jkim

Modified:
  head/sys/conf/kern.pre.mk

Modified: head/sys/conf/kern.pre.mk
==============================================================================
--- head/sys/conf/kern.pre.mk	Thu Jul 22 20:08:02 2010	(r210393)
+++ head/sys/conf/kern.pre.mk	Thu Jul 22 21:31:35 2010	(r210394)
@@ -92,7 +92,8 @@ INCLUDES+= -I$S/dev/cxgb
 
 CFLAGS=	${COPTFLAGS} ${C_DIALECT} ${DEBUG} ${CWARNFLAGS}
 CFLAGS+= ${INCLUDES} -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h
-.if ${CC} != "icc" && ${CC} != "clang"
+.if ${CC} != "icc"
+.if ${CC} != "clang"
 CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT}
 .if ${MACHINE_CPUARCH} != "mips"
 CFLAGS+= --param inline-unit-growth=100
@@ -102,6 +103,7 @@ CFLAGS+= --param large-function-growth=1
 CFLAGS+= --param inline-unit-growth=1000
 CFLAGS+= --param large-function-growth=100000
 .endif
+.endif
 WERROR?= -Werror
 .endif