summaryrefslogtreecommitdiffstats
path: root/sys/conf/kern.pre.mk
diff options
context:
space:
mode:
authorrpaulo <rpaulo@FreeBSD.org>2010-07-22 21:31:35 +0000
committerrpaulo <rpaulo@FreeBSD.org>2010-07-22 21:31:35 +0000
commit9f037cc06a87e61c57a650c2ed9d1cc1a4204832 (patch)
tree59a9af0e7d5f0e3387138dac3e10d35033283a0c /sys/conf/kern.pre.mk
parentd8f5d7b451f1ec00dfbd845d719dafc859eda08d (diff)
downloadFreeBSD-src-9f037cc06a87e61c57a650c2ed9d1cc1a4204832.zip
FreeBSD-src-9f037cc06a87e61c57a650c2ed9d1cc1a4204832.tar.gz
Fix previous commit: don't remove the WERROR definition when using
clang. Submitted by: Dimitry Andric <dimitry at andric.com> Reviewed by: jkim
Diffstat (limited to 'sys/conf/kern.pre.mk')
-rw-r--r--sys/conf/kern.pre.mk4
1 files changed, 3 insertions, 1 deletions
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
OpenPOWER on IntegriCloud