diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-12-15 02:46:14 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-12-15 02:46:14 +0000 |
| commit | e66dbae40be9305c6d77c0c3f285be4c946558f8 (patch) | |
| tree | 4f7464d1fb4789a26134b7ab3fdfb0dd0f323e8e /share | |
| parent | bf8e18c8fac3666f0236bc349a0f6e26c73aabbf (diff) | |
| download | FreeBSD-src-e66dbae40be9305c6d77c0c3f285be4c946558f8.zip FreeBSD-src-e66dbae40be9305c6d77c0c3f285be4c946558f8.tar.gz | |
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
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/local.dirdeps.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/share/mk/local.dirdeps.mk b/share/mk/local.dirdeps.mk index 94bc2a1..0f093b6 100644 --- a/share/mk/local.dirdeps.mk +++ b/share/mk/local.dirdeps.mk @@ -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} |
