From owner-svn-src-projects@FreeBSD.ORG  Sat May 11 00:51:59 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id BA2A24D6;
 Sat, 11 May 2013 00:51:59 +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 ABB9EE9;
 Sat, 11 May 2013 00:51:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4B0px6J033695;
 Sat, 11 May 2013 00:51:59 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4B0pxIL033694;
 Sat, 11 May 2013 00:51:59 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201305110051.r4B0pxIL033694@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Sat, 11 May 2013 00:51:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r250492 - 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: Sat, 11 May 2013 00:51:59 -0000

Author: sjg
Date: Sat May 11 00:51:59 2013
New Revision: 250492
URL: http://svnweb.freebsd.org/changeset/base/250492

Log:
  Keep dirdeps for pseudo machines like "host" and "common" simple.
  Also we need to use DEP_MACHINE_ARCH when expanding CSU_DIR

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

Modified: projects/bmake/share/mk/local.dirdeps.mk
==============================================================================
--- projects/bmake/share/mk/local.dirdeps.mk	Sat May 11 00:50:00 2013	(r250491)
+++ projects/bmake/share/mk/local.dirdeps.mk	Sat May 11 00:51:59 2013	(r250492)
@@ -13,6 +13,13 @@ DIRDEPS += gnu/lib/libssp/libssp_nonshar
 DIRDEPS += pkgs/pseudo/stage
 .endif
 
+M_dep_qual_fixes += C;\.host,[^/.,]*$$;.host;
+M_dep_qual_fixes += C;\.common,[^/.,]*$$;.common;
+
+CSU_DIR.i386 = csu/i386-elf
+CSU_DIR.${DEP_MACHINE_ARCH} ?= csu/${DEP_MACHINE_ARCH}
+CSU_DIR := ${CSU_DIR.${DEP_MACHINE_ARCH}}
+
 # we want to supress these dependencies for host tools
 DIRDEPS_FILTER.host = \
 	Ninclude* \