Author: bdrewery
Date: Thu May 26 23:20:01 2016
New Revision: 300795
URL: https://svnweb.freebsd.org/changeset/base/300795
Log:
WITH_META_MODE: Move the kernel support to kern.pre.mk.
This allows using META_MODE directly from the kernel build directory.
This also allows removing a hack from the DIRDEPS_BUILD kernel target.
Sponsored by: EMC / Isilon Storage Division
Modified:
head/Makefile.inc1
head/sys/conf/kern.pre.mk
head/targets/pseudo/kernel/Makefile
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Thu May 26 23:19:57 2016 (r300794)
+++ head/Makefile.inc1 Thu May 26 23:20:01 2016 (r300795)
@@ -591,11 +591,6 @@ 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.
-KMAKEENV+= META_MODE="${.MAKE.MODE} curdirOk=yes"
-.endif
#
# buildworld
Modified: head/sys/conf/kern.pre.mk
==============================================================================
--- head/sys/conf/kern.pre.mk Thu May 26 23:19:57 2016 (r300794)
+++ head/sys/conf/kern.pre.mk Thu May 26 23:20:01 2016 (r300795)
@@ -19,6 +19,11 @@ _srcconf_included_:
.include <bsd.compiler.mk>
.include "kern.opts.mk"
+# The kernel build always occurs in the object directory which is .CURDIR.
+.if ${.MAKE.MODE:Unormal:Mmeta}
+.MAKE.MODE+= curdirOk=yes
+.endif
+
# Can be overridden by makeoptions or /etc/make.conf
KERNEL_KO?= kernel
KERNEL?= kernel
Modified: head/targets/pseudo/kernel/Makefile
==============================================================================
--- head/targets/pseudo/kernel/Makefile Thu May 26 23:19:57 2016
(r300794)
+++ head/targets/pseudo/kernel/Makefile Thu May 26 23:20:01 2016
(r300795)
@@ -15,10 +15,8 @@ ${KERNCONF}.config: .MAKE ${META_DEPS}
(cd ${KERN_CONFDIR} && \
${CONFIG} ${CONFIGARGS} -d ${KERN_OBJDIR} ${KERNCONF})
-# we need to pass curdirOk=yes to meta mode, since we want .meta files
-# in ${KERN_OBJDIR}
${KERNCONF}.build: .MAKE ${KERNCONF}.config
- (cd ${KERN_OBJDIR} && META_MODE="${.MAKE.MODE} curdirOk=yes" ${.MAKE})
+ (cd ${KERN_OBJDIR} && ${.MAKE})
.if ${.MAKE.LEVEL} > 0
all: ${KERNCONF}.build
_______________________________________________
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"
