From: bdrewery <bdrewery@FreeBSD.org>
Date: Fri, 6 Nov 2015 05:28:08 +0000 (+0000)
Subject: Don't allow environment-set options to bleed into src.conf.5 generation.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=972c47e3eef302dc8d93faf162ef2b63e53f71e2;p=people%2Fliuw%2Ffreebsd.git

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

MFC after:	2 weeks
Sponsored by:	EMC / Isilon Storage Division
---

diff --git a/tools/build/options/makeman b/tools/build/options/makeman
index 1595499ca80..c0c12b1bdb7 100755
--- a/tools/build/options/makeman
+++ b/tools/build/options/makeman
@@ -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 \
 		    SRC_ENV_CONF=/dev/null SRCCONF=/dev/null \
 		    __MAKE_CONF=/dev/null \
 		    TARGET_ARCH=${target#*/} TARGET=${target%/*} |
@@ -97,7 +97,7 @@ show()
 		exit 1
 		;;
 	esac
-	${make} .MAKE.MODE=normal "$@" showconfig __MAKE_CONF=/dev/null \
+	env -i ${make} .MAKE.MODE=normal "$@" showconfig __MAKE_CONF=/dev/null \
 	    SRCCONF=/dev/null |
 	while read var _ val ; do
 		opt=${var#MK_}