svn commit: r291806 - stable/9/tools/build/options

[Bryan Drewery]

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