From owner-svn-src-head@freebsd.org  Thu Sep 17 21:49:30 2015
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 1A2659CF0A6;
 Thu, 17 Sep 2015 21:49:30 +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 0A6C0199C;
 Thu, 17 Sep 2015 21:49:30 +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 t8HLnTtQ016834;
 Thu, 17 Sep 2015 21:49:29 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8HLnT1n016833;
 Thu, 17 Sep 2015 21:49:29 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201509172149.t8HLnT1n016833@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 21:49:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r287939 - 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-head@freebsd.org
X-Mailman-Version: 2.1.20
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: Thu, 17 Sep 2015 21:49:30 -0000

Author: bdrewery
Date: Thu Sep 17 21:49:29 2015
New Revision: 287939
URL: https://svnweb.freebsd.org/changeset/base/287939

Log:
  Add a check to ensure that the env-only mkopts are not set via src.conf.
  
  Sponsored by:	EMC / Isilon Storage Division

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

Modified: head/share/mk/src.sys.mk
==============================================================================
--- head/share/mk/src.sys.mk	Thu Sep 17 21:12:47 2015	(r287938)
+++ head/share/mk/src.sys.mk	Thu Sep 17 21:49:29 2015	(r287939)
@@ -8,9 +8,27 @@
 # Allow user to configure things that only effect src tree builds.
 SRCCONF?=	/etc/src.conf
 .if (exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf") && !target(_srcconf_included_)
+
+# Validate that the user didn't try setting an env-only variable in
+# their src.conf. This benefits from already including bsd.mkopt.mk.
+.for var in ${__ENV_ONLY_OPTIONS}
+__presrcconf_${var}:=	${MK_${var}:U-}${WITHOUT_${var}:Uno:Dyes}${WITH_${var}:Uno:Dyes}
+.endfor
+
 .sinclude "${SRCCONF}"
 _srcconf_included_:	.NOTMAIN
+
+# Validate the env-only variables.
+.for var in ${__ENV_ONLY_OPTIONS}
+__postrcconf_${var}:=	${MK_${var}:U-}${WITHOUT_${var}:Uno:Dyes}${WITH_${var}:Uno:Dyes}
+.if ${__presrcconf_${var}} != ${__postrcconf_${var}}
+.error Option ${var} may only be defined in ${SRC_ENV_CONF},  environment, or make argument, not ${SRCCONF}.
 .endif
+.undef __presrcconf_${var}
+.undef __postrcconf_${var}
+.endfor
+
+.endif # SRCCONF
 
 # tempting, but bsd.compiler.mk causes problems this early
 # probably need to remove dependence on bsd.own.mk