From owner-svn-src-all@freebsd.org  Wed Nov 18 21:39:59 2015
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 83889A32271;
 Wed, 18 Nov 2015 21:39:59 +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 4EB4A196A;
 Wed, 18 Nov 2015 21:39:59 +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 tAILdwDl071490;
 Wed, 18 Nov 2015 21:39:58 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAILdwGK071489;
 Wed, 18 Nov 2015 21:39:58 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201511182139.tAILdwGK071489@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: Wed, 18 Nov 2015 21:39:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r291027 - head/include
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.20
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: Wed, 18 Nov 2015 21:39:59 -0000

Author: bdrewery
Date: Wed Nov 18 21:39:58 2015
New Revision: 291027
URL: https://svnweb.freebsd.org/changeset/base/291027

Log:
  META MODE: Fix changing what "MACHINE=host" means when computing dirdeps for include/.
  
  The _SKIP_BUILD is used while computing DIRDEPS.  If MACHINE=host is passed in
  then this logic was replacing 'MACHINE' with a literal value of the host arch,
  which then caused the dirdeps graph to be wrong since it no longer had the
  literal 'host' for any of include's dependencies.
  
  This is a NOP currently since include/ is not usually built with MACHINE=host.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/include/Makefile

Modified: head/include/Makefile
==============================================================================
--- head/include/Makefile	Wed Nov 18 21:37:46 2015	(r291026)
+++ head/include/Makefile	Wed Nov 18 21:39:58 2015	(r291027)
@@ -376,7 +376,7 @@ symlinks:
 	@touch ${.OBJDIR}/${.TARGET}
 .endif
 
-.if ${MACHINE} == "host"
+.if ${MACHINE} == "host" && !defined(_SKIP_BUILD)
 # we're here because we are building a sysroot...
 # we need MACHINE et al set correctly
 HOST_MACHINE!= uname -m