svn commit: r210394 - head/sys/conf

[Rui Paulo]

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