From owner-svn-src-all@freebsd.org  Thu Sep 17 17:35:07 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B47BE9CF6B4;
 Thu, 17 Sep 2015 17:35:07 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 A555A1504;
 Thu, 17 Sep 2015 17:35:07 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8HHZ7oI011876;
 Thu, 17 Sep 2015 17:35:07 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8HHZ7uj011875;
 Thu, 17 Sep 2015 17:35:07 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201509171735.t8HHZ7uj011875@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 17 Sep 2015 17:35:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r287924 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Sep 2015 17:35:07 -0000

Author: bdrewery
Date: Thu Sep 17 17:35:06 2015
New Revision: 287924
URL: https://svnweb.freebsd.org/changeset/base/287924

Log:
  Include bsd.mkopt.mk after local.sys.env.mk (which includes /etc/src-env.conf).
  
  This will allow setting WITH_META_MODE in that file rather that requiring
  it to be set in the environment.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/share/mk/sys.mk

Modified: head/share/mk/sys.mk
==============================================================================
--- head/share/mk/sys.mk	Thu Sep 17 17:27:49 2015	(r287923)
+++ head/share/mk/sys.mk	Thu Sep 17 17:35:06 2015	(r287924)
@@ -29,8 +29,6 @@ __DEFAULT_DEPENDENT_OPTIONS= \
 	STAGING/META_MODE \
 	SYSROOT/META_MODE
 
-.include <bsd.mkopt.mk>
-
 # early include for customization
 # see local.sys.mk below
 # Not included when building in fmake compatibility mode (still needed
@@ -38,6 +36,8 @@ __DEFAULT_DEPENDENT_OPTIONS= \
 .if defined(.PARSEDIR)
 .sinclude <local.sys.env.mk>
 
+.include <bsd.mkopt.mk>
+
 .if ${MK_META_MODE} == "yes"
 .sinclude <meta.sys.mk>
 .elif ${MK_META_FILES} == "yes" && defined(.MAKEFLAGS)
@@ -52,7 +52,8 @@ __DEFAULT_DEPENDENT_OPTIONS= \
 .sinclude <auto.obj.mk>
 .endif
 .endif
-
+.else # bmake
+.include <bsd.mkopt.mk>
 .endif
 
 # If the special target .POSIX appears (without prerequisites or