svn commit: r291731 - head/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Fri Dec  4 03:17:04 2015
New Revision: 291731
URL: https://svnweb.freebsd.org/changeset/base/291731

Log:
  DIRDEPS_BUILD: For the bootstrapped LIBADD from DPADD, resolve paths to RELDIR.
  
  This allows the LIBDEPS/DPADD for the clang build to not have
  ../../../lib/clang/* in DIRDEPS.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/share/mk/local.dirdeps.mk

Modified: head/share/mk/local.dirdeps.mk
==============================================================================
--- head/share/mk/local.dirdeps.mk	Fri Dec  4 01:28:48 2015	(r291730)
+++ head/share/mk/local.dirdeps.mk	Fri Dec  4 03:17:04 2015	(r291731)
@@ -131,9 +131,11 @@ DIRDEPS+=	usr.bin/yacc.host
 # BUILD_AT_LEVEL0, which we don't use).
 # This only works for DPADD with full OBJ/SRC paths, which is mostly just
 # _INTERNALLIBS.
-DIRDEPS+= \
-	${DPADD:M${OBJTOP}*:H:C,${OBJTOP}[^/]*/,,:N.:O:u} \
+_DP_DIRDEPS+= \
+	${DPADD:M${OBJTOP}*:H:tA:C,${OBJTOP}[^/]*/,,:N.:O:u} \
 	${DPADD:M${OBJROOT}*:N${OBJTOP}*:N${STAGE_ROOT}/*:H:S,${OBJROOT},,:C,^([^/]+)/(.*),\2.\1,:S,${HOST_TARGET}$,host,:N.*:O:u}
+# Resolve the paths to RELDIRs
+DIRDEPS+= ${_DP_DIRDEPS:C,^,${SRCTOP}/,:tA:C,^${SRCTOP}/,,}
 .endif
 .if !empty(LIBADD)
 # Also handle LIBADD for non-internal libraries.