svn commit: r325196 - head/tools/build/options

Bryan Drewery bdrewery at FreeBSD.org
Tue Oct 31 02:18:07 UTC 2017


Author: bdrewery
Date: Tue Oct 31 02:18:06 2017
New Revision: 325196
URL: https://svnweb.freebsd.org/changeset/base/325196

Log:
  makeman: Ensure MK_AUTO_OBJ is disabled in some lookups.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  head/tools/build/options/makeman

Modified: head/tools/build/options/makeman
==============================================================================
--- head/tools/build/options/makeman	Tue Oct 31 02:12:13 2017	(r325195)
+++ head/tools/build/options/makeman	Tue Oct 31 02:18:06 2017	(r325196)
@@ -44,7 +44,7 @@ no_targets()
 
 show_options()
 {
-	ALL_TARGETS=$(echo $(${make} targets | tail -n +2))
+	ALL_TARGETS=$(echo $(${make} targets MK_AUTO_OBJ=no | tail -n +2))
 	rm -f $t/settings
 	for target in ${ALL_TARGETS} ; do
 		prev_opt=
@@ -245,7 +245,7 @@ EOF
 	show with SRC_ENV_CONF=/dev/null | sort | sed 's/$/=/' > $t/src.conf
 	show settings SRC_ENV_CONF=$t/src.conf | sort > $t/config_WITH_ALL
 	show without SRC_ENV_CONF=/dev/null | sort > $t/config_WITHOUT_ALL
-	env_only_options="$(${make} -V __ENV_ONLY_OPTIONS)"
+	env_only_options="$(${make} MK_AUTO_OBJ=no -V __ENV_ONLY_OPTIONS)"
 
 	show_options |
 	while read opt targets ; do


More information about the svn-src-all mailing list