From bd1944cacc8cd9e506ad934f6a3ad0a8c1fc0c6a Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 4 Dec 2015 03:17:04 +0000
Subject: [PATCH] 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
---
 share/mk/local.dirdeps.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/share/mk/local.dirdeps.mk b/share/mk/local.dirdeps.mk
index 10d259c4366e..a24d01278d55 100644
--- a/share/mk/local.dirdeps.mk
+++ b/share/mk/local.dirdeps.mk
@@ -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.