From 3dfad7c764276b043bacefe246f5eb6745ce8ea6 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Fri, 6 Nov 2015 05:28:08 +0000 Subject: [PATCH] Don't allow environment-set options to bleed into src.conf.5 generation. MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division --- tools/build/options/makeman | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/build/options/makeman b/tools/build/options/makeman index 1595499ca80c..c0c12b1bdb76 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_}