Author: jhb
Date: Fri Aug 31 21:10:38 2012
New Revision: 239956
URL: http://svn.freebsd.org/changeset/base/239956
Log:
The implied source variable (.IMPSRC) didn't actually work in my previous
commit. Change this to use .ALLSRC instead, but be careful to only use
the .fw file for NORMAL_FWO to ignore opt_global.h.
Modified:
head/sys/conf/kern.pre.mk
Modified: head/sys/conf/kern.pre.mk
==============================================================================
--- head/sys/conf/kern.pre.mk Fri Aug 31 20:54:30 2012 (r239955)
+++ head/sys/conf/kern.pre.mk Fri Aug 31 21:10:38 2012 (r239956)
@@ -131,8 +131,8 @@ NORMAL_C_NOWERROR= ${CC} -c ${CFLAGS} ${
NORMAL_M= ${AWK} -f $S/tools/makeobjops.awk ${.IMPSRC} -c ; \
${CC} -c ${CFLAGS} ${WERROR} ${PROF} ${.PREFIX}.c
-NORMAL_FW= uudecode -o ${.TARGET} ${.IMPSRC}
-NORMAL_FWO= ${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ${.IMPSRC}
+NORMAL_FW= uudecode -o ${.TARGET} ${.ALLSRC}
+NORMAL_FWO= ${LD} -b binary -d -warn-common -r -d -o ${.TARGET}
${.ALLSRC:M*.fw}
# Special flags for managing the compat compiles for ZFS
ZFS_CFLAGS= -DFREEBSD_NAMECACHE -DBUILDING_ZFS -nostdinc
-I$S/cddl/compat/opensolaris -I$S/cddl/contrib/opensolaris/uts/common/fs/zfs
-I$S/cddl/contrib/opensolaris/uts/common/zmod
-I$S/cddl/contrib/opensolaris/uts/common -I$S
-I$S/cddl/contrib/opensolaris/common/zfs -I$S/cddl/contrib/opensolaris/common
${CFLAGS} -Wno-unknown-pragmas -Wno-missing-prototypes -Wno-undef
-Wno-strict-prototypes -Wno-cast-qual -Wno-parentheses -Wno-redundant-decls
-Wno-missing-braces -Wno-uninitialized -Wno-unused -Wno-inline -Wno-switch
-Wno-pointer-arith -Wno-unknown-pragmas
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
