From dbf5bd502abb1dcebc1c84dcbecc841fc22925b6 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Wed, 18 Nov 2015 21:39:58 +0000 Subject: [PATCH] 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 --- include/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/Makefile b/include/Makefile index 61bfbc69dedd..d59900f245a4 100644 --- a/include/Makefile +++ b/include/Makefile @@ -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