Author: bdrewery
Date: Fri Nov  6 05:28:08 2015
New Revision: 290435
URL: https://svnweb.freebsd.org/changeset/base/290435

Log:
  Don't allow environment-set options to bleed into src.conf.5 generation.
  
  MFC after:    2 weeks
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/tools/build/options/makeman

Modified: head/tools/build/options/makeman
==============================================================================
--- head/tools/build/options/makeman    Fri Nov  6 04:56:52 2015        
(r290434)
+++ head/tools/build/options/makeman    Fri Nov  6 05:28:08 2015        
(r290435)
@@ -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_}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to