]> xenbits.xensource.com Git - people/liuw/freebsd.git/commitdiff
Don't allow environment-set options to bleed into src.conf.5 generation.
authorbdrewery <bdrewery@FreeBSD.org>
Fri, 6 Nov 2015 05:28:08 +0000 (05:28 +0000)
committerbdrewery <bdrewery@FreeBSD.org>
Fri, 6 Nov 2015 05:28:08 +0000 (05:28 +0000)
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division

tools/build/options/makeman

index 1595499ca80c35cb7ccdb8c0da3df2ce5b0e2206..c0c12b1bdb766d5f8e0f8951da3899b9b1a7ce3f 100755 (executable)
@@ -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_}