From owner-svn-src-all@freebsd.org  Fri Mar 11 23:45:15 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 16EDEACD11B;
 Fri, 11 Mar 2016 23:45:15 +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 DCE19C31;
 Fri, 11 Mar 2016 23:45:14 +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 u2BNjDIJ010653;
 Fri, 11 Mar 2016 23:45:13 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2BNjDEV010652;
 Fri, 11 Mar 2016 23:45:13 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201603112345.u2BNjDEV010652@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: Fri, 11 Mar 2016 23:45:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r296696 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Mar 2016 23:45:15 -0000

Author: bdrewery
Date: Fri Mar 11 23:45:13 2016
New Revision: 296696
URL: https://svnweb.freebsd.org/changeset/base/296696

Log:
  DIRDEPS_BUILD: Avoid rebuilds due to changed build commands with newly staged tools.
  
  This is a follow-up to r291561 which reworked the bootstrap tool PATH
  handling.
  
  An example of this is when building lib/clang/libclangedit.  At first
  clang-tblgen will not be staged in the host tree so it will have
  CLANG_TBLGEN=clang-tblgen set and exported.  During the build though it
  will stage clang-tblgen and then find it via the PATH.  On the next
  build it finds clang-tblgen in the stage directory and would set
  CLANG_TBLGEN=<stagedir/usr/bin>/clang-tblgen thus causing the build
  command to change.  In both cases the same exact tool was used though so
  there is no need to rebuild.  If the tool did change the normal
  meta/filemon handling would pick that up via timestamp comparisons and
  rebuild.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/share/mk/local.meta.sys.mk

Modified: head/share/mk/local.meta.sys.mk
==============================================================================
--- head/share/mk/local.meta.sys.mk	Fri Mar 11 23:45:09 2016	(r296695)
+++ head/share/mk/local.meta.sys.mk	Fri Mar 11 23:45:13 2016	(r296696)
@@ -236,8 +236,7 @@ PATH:= ${TOOLSDIR}${dir}:${PATH}
 _toolchain_bin.${var}=	${TOOLSDIR}${_toolchain_bin_${var}:U/usr/bin/${var:tl}}
 .if exists(${_toolchain_bin.${var}})
 HOST_${var}?=	${_toolchain_bin.${var}}
-${var}?=	${HOST_${var}}
-.export		HOST_${var} ${var}
+.export		HOST_${var}
 .endif
 .endfor
 .endif