Author: bdrewery
Date: Tue Apr 26 18:08:51 2016
New Revision: 298654
URL: https://svnweb.freebsd.org/changeset/base/298654
Log:
WITH_META_MODE: Allow buildkernel to create .meta files with curdir==objdir.
Without this the incremental build was broken since .depend.* are not
generated with .MAKE.MODE=meta and .meta files were not created to
track dependencies. Typically meta mode does not create .meta files
when building with curdir==objdir but the kernel build is special.
Reported by: Nikolai Lifanov <lifa...@mail.lifanov.com>
Sponsored by: EMC / Isilon Storage Division
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Tue Apr 26 17:39:54 2016 (r298653)
+++ head/Makefile.inc1 Tue Apr 26 18:08:51 2016 (r298654)
@@ -531,6 +531,11 @@ IMAKE_MTREE= MTREE_CMD="mtree ${MTREEFLA
# kernel stage
KMAKEENV= ${WMAKEENV}
KMAKE= ${KMAKEENV} ${MAKE} ${.MAKEFLAGS} ${KERNEL_FLAGS}
KERNEL=${INSTKERNNAME}
+.if ${MK_META_MODE} == "yes"
+# meta mode normally is disallowed when building from curdir==objdir, but we
+# want to allow it for the kernel build.
+KMAKE+= .MAKE.MODE="${.MAKE.MODE} curdirOk=yes"
+.endif
#
# buildworld
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
