svn commit: r250492 - projects/bmake/share/mk

[Simon J. Gerraty]

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* \