From owner-svn-src-projects@FreeBSD.ORG  Tue Mar 12 17:21:04 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 754C54FD;
 Tue, 12 Mar 2013 17:21:04 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 65900252;
 Tue, 12 Mar 2013 17:21:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2CHL4nQ063578;
 Tue, 12 Mar 2013 17:21:04 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2CHL4cT063577;
 Tue, 12 Mar 2013 17:21:04 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201303121721.r2CHL4cT063577@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Tue, 12 Mar 2013 17:21:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r248211 - projects/bmake/share/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Mar 2013 17:21:04 -0000

Author: sjg
Date: Tue Mar 12 17:21:03 2013
New Revision: 248211
URL: http://svnweb.freebsd.org/changeset/base/248211

Log:
  Apply DEP_DIRDEPS_FILTER.${DEP_MACHINE} as needed.
  Use DEP_DIRDEPS_FILTER.host to supress dependencies for host tools.

Modified:
  projects/bmake/share/mk/local.dirdeps.mk
  projects/bmake/share/mk/local.sys.mk

Modified: projects/bmake/share/mk/local.dirdeps.mk
==============================================================================
--- projects/bmake/share/mk/local.dirdeps.mk	Tue Mar 12 14:30:36 2013	(r248210)
+++ projects/bmake/share/mk/local.dirdeps.mk	Tue Mar 12 17:21:03 2013	(r248211)
@@ -1,13 +1,3 @@
-.if !target(_DIRDEP_USE)
-# first time read
-.if ${MACHINE} == "host"
-DIRDEPS_FILTER+= \
-	Ninclude* \
-	Nlib/* \
-	Ngnu/lib/* \
-
-.endif
-.endif
 
 # this is how we can handle optional dependencies
 .if ${MK_SSP:Uno} != "no" && defined(PROG)
@@ -18,3 +8,15 @@ DIRDEPS += gnu/lib/libssp/libssp_nonshar
 .if ${DEP_RELDIR:U${RELDIR}} != "pkgs/pseudo/stage"
 DIRDEPS += pkgs/pseudo/stage
 .endif
+
+# we want to supress these dependencies for host tools
+DEP_DIRDEPS_FILTER.host = \
+	Ninclude* \
+	Nlib/* \
+	Ngnu/lib/* \
+
+
+.if !empty(DIRDEPS) && !empty(DEP_DIRDEPS_FILTER.${DEP_MACHINE})
+DIRDEPS := ${DIRDEPS:${DEP_DIRDEPS_FILTER.${DEP_MACHINE}:ts:}}
+.endif
+

Modified: projects/bmake/share/mk/local.sys.mk
==============================================================================
--- projects/bmake/share/mk/local.sys.mk	Tue Mar 12 14:30:36 2013	(r248210)
+++ projects/bmake/share/mk/local.sys.mk	Tue Mar 12 17:21:03 2013	(r248211)
@@ -83,6 +83,10 @@ HOST_OBJTOP ?= ${OBJROOT}${HOST_TARGET}
 
 .if ${OBJTOP} == ${HOST_OBJTOP} || ${REQUESTED_MACHINE:U${MACHINE}} == "host"
 MACHINE= host
+.if ${TARGET_MACHINE:Uno} == ${HOST_TARGET}
+# not what we want
+TARGET_MACHINE= host
+.endif
 .endif
 .if ${MACHINE} == "host"
 OBJTOP := ${HOST_OBJTOP}