From owner-svn-src-head@freebsd.org  Sat Nov 18 20:10:37 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 8E922DDAC9B;
 Sat, 18 Nov 2017 20:10:37 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 5B5B27B200;
 Sat, 18 Nov 2017 20:10:37 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAIKAaw7005607;
 Sat, 18 Nov 2017 20:10:36 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAIKAafB005606;
 Sat, 18 Nov 2017 20:10:36 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201711182010.vAIKAafB005606@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: Sat, 18 Nov 2017 20:10:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r325975 - head/share/mk
X-SVN-Group: head
X-SVN-Commit-Author: bdrewery
X-SVN-Commit-Paths: head/share/mk
X-SVN-Commit-Revision: 325975
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Nov 2017 20:10:37 -0000

Author: bdrewery
Date: Sat Nov 18 20:10:36 2017
New Revision: 325975
URL: https://svnweb.freebsd.org/changeset/base/325975

Log:
  Evaluate options after including src-env.conf and before Makefile.sys.inc.
  
  Fixes top-level breakage in r325974.
  
  Pointyhat to:	bdrewery
  Sponsored by:	Dell

Modified:
  head/share/mk/src.sys.env.mk

Modified: head/share/mk/src.sys.env.mk
==============================================================================
--- head/share/mk/src.sys.env.mk	Sat Nov 18 20:01:15 2017	(r325974)
+++ head/share/mk/src.sys.env.mk	Sat Nov 18 20:10:36 2017	(r325975)
@@ -22,6 +22,8 @@ SRC_ENV_CONF?= /etc/src-env.conf
 _src_env_conf_included_:	.NOTMAIN
 .endif
 
+.include <bsd.mkopt.mk>
+
 # Top-level installs should not use meta mode as it may prevent installing
 # based on cookies.
 .if make(*install*) && ${.MAKE.LEVEL} == 0