From 4b36e6ff5872ac64e1a92f33bcaf69970fbe479a Mon Sep 17 00:00:00 2001
From: bdrewery <bdrewery@FreeBSD.org>
Date: Thu, 26 May 2016 23:20:01 +0000
Subject: 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
---
 sys/conf/kern.pre.mk | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'sys/conf')

diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 591c988..d5781db 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -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
-- 
cgit v1.1