d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build LOCAL_LIB_DIRS along with system lib dirs, rather than building them

Browse Source 
in parallel with LOCAL_DIRS and all the other system post-libs stuff.
This commit is contained in:
Ian Lepore 2018-06-17 14:13:45 +00:00
parent cd9cc48b9a
commit 2a821fd9d2
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile.inc1
View File

@ -245,6 +245,17 @@ X${BINUTIL}?= ${${BINUTIL}}
SUBDIR= ${SUBDIR_OVERRIDE} SUBDIR= ${SUBDIR_OVERRIDE}
.else .else
SUBDIR= lib libexec SUBDIR= lib libexec
# Add LOCAL_LIB_DIRS, but only if they will not be picked up as a SUBDIR
# of a LOCAL_DIRS directory. This allows LOCAL_DIRS=foo and
# LOCAL_LIB_DIRS=foo/lib to behave as expected.
.for _DIR in ${LOCAL_DIRS:M*/} ${LOCAL_DIRS:N*/:S|$|/|}
_REDUNDANT_LIB_DIRS+= ${LOCAL_LIB_DIRS:M${_DIR}*}
.endfor
.for _DIR in ${LOCAL_LIB_DIRS}
.if ${_DIR} == ".WAIT" || (empty(_REDUNDANT_LIB_DIRS:M${_DIR}) && exists(${.CURDIR}/${_DIR}/Makefile))
SUBDIR+= ${_DIR}
.endif
.endfor
.if !defined(NO_ROOT) && (make(installworld) || make(install)) .if !defined(NO_ROOT) && (make(installworld) || make(install))
# Ensure libraries are installed before progressing. # Ensure libraries are installed before progressing.
SUBDIR+=.WAIT SUBDIR+=.WAIT
@ -283,17 +294,6 @@ SUBDIR+= tests
SUBDIR+= ${_DIR} SUBDIR+= ${_DIR}
.endif .endif
.endfor .endfor
# Add LOCAL_LIB_DIRS, but only if they will not be picked up as a SUBDIR
# of a LOCAL_DIRS directory. This allows LOCAL_DIRS=foo and
# LOCAL_LIB_DIRS=foo/lib to behave as expected.
.for _DIR in ${LOCAL_DIRS:M*/} ${LOCAL_DIRS:N*/:S|$|/|}
_REDUNDANT_LIB_DIRS+= ${LOCAL_LIB_DIRS:M${_DIR}*}
.endfor
.for _DIR in ${LOCAL_LIB_DIRS}
.if ${_DIR} == ".WAIT" || (empty(_REDUNDANT_LIB_DIRS:M${_DIR}) && exists(${.CURDIR}/${_DIR}/Makefile))
SUBDIR+= ${_DIR}
.endif
.endfor
# We must do etc/ last as it hooks into building the man whatis file # We must do etc/ last as it hooks into building the man whatis file
# by calling 'makedb' in share/man. This is only relevant for # by calling 'makedb' in share/man. This is only relevant for