From 9f037cc06a87e61c57a650c2ed9d1cc1a4204832 Mon Sep 17 00:00:00 2001
From: rpaulo <rpaulo@FreeBSD.org>
Date: Thu, 22 Jul 2010 21:31:35 +0000
Subject: Fix previous commit: don't remove the WERROR definition when using
 clang.

Submitted by:	Dimitry Andric <dimitry at andric.com>
Reviewed by:	jkim
---
 sys/conf/kern.pre.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'sys/conf/kern.pre.mk')

diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 5c22abd..7642fca 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -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=1000
 CFLAGS+= --param inline-unit-growth=1000
 CFLAGS+= --param large-function-growth=100000
 .endif
+.endif
 WERROR?= -Werror
 .endif
 
-- 
cgit v1.1