svn commit: r292242 - head/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Tue Dec 15 02:46:14 2015
New Revision: 292242
URL: https://svnweb.freebsd.org/changeset/base/292242

Log:
  DIRDEPS_BUILD: Fix incorrectly adding in RELDIR for DIRDEPS in bootstrapping.
  
  This is not wrong, but was unexpected.  Using <empty>:H results in '.' which
  then using the rest of the conversion was added in RELDIR.  This was also
  causing an empty _DP_DIRDEPS to resolve to SRCTOP for 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	Tue Dec 15 02:27:31 2015	(r292241)
+++ head/share/mk/local.dirdeps.mk	Tue Dec 15 02:46:14 2015	(r292242)
@@ -135,11 +135,13 @@ DIRDEPS+=	usr.bin/yacc.host
 # This only works for DPADD with full OBJ/SRC paths, which is mostly just
 # _INTERNALLIBS.
 _DP_DIRDEPS= \
-	${DPADD:M${OBJTOP}*:H:tA:C,${OBJTOP}[^/]*/,,:N.:O:u} \
+	${DPADD:M${OBJTOP}*:H:N.: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
+.if !empty(_DP_DIRDEPS)
 DIRDEPS+= ${_DP_DIRDEPS:C,^,${SRCTOP}/,:tA:C,^${SRCTOP}/,,}
 .endif
+.endif	# !empty(DPADD)
 .if !empty(LIBADD)
 # Also handle LIBADD for non-internal libraries.
 .for _lib in ${LIBADD}