Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 18 Nov 2015 21:39:58 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r291027 - head/include
Message-ID:  <201511182139.tAILdwGK071489@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511182139.tAILdwGK071489>