From owner-svn-src-head@freebsd.org  Tue Oct 31 02:18:07 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B87FBE48395;
 Tue, 31 Oct 2017 02:18:07 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 83D3881779;
 Tue, 31 Oct 2017 02:18:07 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9V2I6Vu001792;
 Tue, 31 Oct 2017 02:18:06 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V2I6kW001791;
 Tue, 31 Oct 2017 02:18:06 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201710310218.v9V2I6kW001791@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Tue, 31 Oct 2017 02:18:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r325196 - head/tools/build/options
X-SVN-Group: head
X-SVN-Commit-Author: bdrewery
X-SVN-Commit-Paths: head/tools/build/options
X-SVN-Commit-Revision: 325196
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 31 Oct 2017 02:18:07 -0000

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