svn commit: r300344 - head

[Bryan Drewery]

Author: bdrewery
Date: Sat May 21 01:31:51 2016
New Revision: 300344
URL: https://svnweb.freebsd.org/changeset/base/300344

Log:
  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

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Sat May 21 01:31:48 2016	(r300343)
+++ head/Makefile.inc1	Sat May 21 01:31:51 2016	(r300344)
@@ -533,7 +533,7 @@ KMAKE=		${KMAKEENV} ${MAKE} ${.MAKEFLAGS
 .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
 
 #