From owner-svn-src-projects@FreeBSD.ORG  Sun May 24 02:46:09 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1CED8716;
 Sun, 24 May 2015 02:46:09 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0BCEB1E15;
 Sun, 24 May 2015 02:46:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4O2k8hx068229;
 Sun, 24 May 2015 02:46:08 GMT (envelope-from sjg@FreeBSD.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4O2k8Ew068228;
 Sun, 24 May 2015 02:46:08 GMT (envelope-from sjg@FreeBSD.org)
Message-Id: <201505240246.t4O2k8Ew068228@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org
 using -f
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Sun, 24 May 2015 02:46:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r283348 - projects/bmake/share/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 May 2015 02:46:09 -0000

Author: sjg
Date: Sun May 24 02:46:08 2015
New Revision: 283348
URL: https://svnweb.freebsd.org/changeset/base/283348

Log:
  Add options for auto obj and meta mode to sys.mk

Modified:
  projects/bmake/share/mk/sys.mk

Modified: projects/bmake/share/mk/sys.mk
==============================================================================
--- projects/bmake/share/mk/sys.mk	Sun May 24 02:45:15 2015	(r283347)
+++ projects/bmake/share/mk/sys.mk	Sun May 24 02:46:08 2015	(r283348)
@@ -328,10 +328,30 @@ __MAKE_CONF?=/etc/make.conf
 .endif
 
 # Setup anything for the FreeBSD source build, if we're building
-# inside the source tree. Needs to be after make.conf, but before
-# local stuff.
+# inside the source tree. Needs to be after make.conf
 .sinclude <src.sys.mk>
 
+# Some options we need now
+__DEFAULT_NO_OPTIONS+= \
+	AUTO_OBJ \
+	META_MODE \
+	META_FILES \
+	STAGING
+
+.include <bsd.mkopt.mk>
+
+.if ${MK_AUTO_OBJ} == "yes"
+# This needs to be done early - before .PATH is computed
+.sinclude <auto.obj.mk>
+.endif
+.if ${MK_META_MODE} == "yes"
+.sinclude <meta.sys.mk>
+.elif ${MK_META_FILES} == "yes"
+.MAKE.MODE= meta verbose
+.else
+MK_STAGING= no
+.endif
+
 .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
 SHELL=	${__MAKE_SHELL}
 .SHELL: path=${__MAKE_SHELL}