From owner-svn-src-stable@freebsd.org  Fri Dec  4 18:32:56 2015
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 9CE0AA412AC;
 Fri,  4 Dec 2015 18:32:56 +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 27F0112FB;
 Fri,  4 Dec 2015 18:32:56 +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 tB4IWtS4025655;
 Fri, 4 Dec 2015 18:32:55 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB4IWtSc025654;
 Fri, 4 Dec 2015 18:32:55 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201512041832.tB4IWtSc025654@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: Fri, 4 Dec 2015 18:32:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r291806 - stable/9/tools/build/options
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Dec 2015 18:32:56 -0000

Author: bdrewery
Date: Fri Dec  4 18:32:55 2015
New Revision: 291806
URL: https://svnweb.freebsd.org/changeset/base/291806

Log:
  MFC r290435:
  
    Don't allow environment-set options to bleed into src.conf.5 generation.

Modified:
  stable/9/tools/build/options/makeman
Directory Properties:
  stable/9/tools/build/options/   (props changed)

Modified: stable/9/tools/build/options/makeman
==============================================================================
--- stable/9/tools/build/options/makeman	Fri Dec  4 18:32:39 2015	(r291805)
+++ stable/9/tools/build/options/makeman	Fri Dec  4 18:32:55 2015	(r291806)
@@ -33,7 +33,7 @@ show_options()
 	ALL_TARGETS=$(echo $(${make} targets | tail -n +2))
 	rm -f $t/settings
 	for target in ${ALL_TARGETS} ; do
-		${make} showconfig \
+		env -i ${make} showconfig \
 		    SRCCONF=/dev/null __MAKE_CONF=/dev/null \
 		    TARGET_ARCH=${target#*/} TARGET=${target%/*} |
 		while read var _ val ; do
@@ -96,7 +96,7 @@ show()
 		exit 1
 		;;
 	esac
-	${make} "$@" showconfig __MAKE_CONF=/dev/null |
+	env -i ${make} "$@" showconfig __MAKE_CONF=/dev/null |
 	while read var _ val ; do
 		opt=${var#MK_}
 		case ${val} in