summaryrefslogtreecommitdiffstats
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2016-05-21 01:31:51 +0000
committerbdrewery <bdrewery@FreeBSD.org>2016-05-21 01:31:51 +0000
commitfde5f82005f8bb3ef79bba70d96c708d0da8647c (patch)
treee7d2d5e600f361347baaf35964fb20eafef60279 /Makefile.inc1
parente3900077b6d42d1633daf8646113c4ec21598583 (diff)
downloadFreeBSD-src-fde5f82005f8bb3ef79bba70d96c708d0da8647c.zip
FreeBSD-src-fde5f82005f8bb3ef79bba70d96c708d0da8647c.tar.gz
WITH_META_MODE: Use META_MODE rather than .MAKE.MODE for buildkernel.
This is mostly a style change so that other code does not duplicate it. The problem is when META_MODE needs to be disabled but it has been overridden by .MAKE.MODE. Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc12
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 36134f5..0192155 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -533,7 +533,7 @@ 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"
+KMAKEENV+= META_MODE="${.MAKE.MODE} curdirOk=yes"
.endif
#
OpenPOWER on IntegriCloud