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

MFC r289286,r291338,r291340:

Browse Source 
r289286:
    Follow-up r288218 by ensuring common objects are built before recursing.
  r291338:
    Fix the "common object" handling to not depend on ".o" if SRCS only
    contains headers.
  r291340:
    Follow-up r291338 to handle .d, .y and .l files better as well.
This commit is contained in:
bdrewery 2015-12-04 18:06:47 +00:00
parent 241e144b76
commit eae1434b51
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
share/mk/bsd.progs.mk
View File

@ -92,6 +92,28 @@ $v =
# tell progs.mk we might want to install things
PROGS_TARGETS+= checkdpadd clean cleandepend cleandir depend install
# Find common sources among the PROGS and depend on them before building
# anything. This allows parallelization without them each fighting over
# the same objects.
_PROGS_COMMON_SRCS=
_PROGS_ALL_SRCS=
.for p in ${PROGS}
.for s in ${SRCS.${p}}
.if ${_PROGS_ALL_SRCS:M${s}} && !${_PROGS_COMMON_SRCS:M${s}}
_PROGS_COMMON_SRCS+= ${s}
.else
_PROGS_ALL_SRCS+= ${s}
.endif
.endfor
.endfor
.if !empty(_PROGS_COMMON_SRCS)
_PROGS_COMMON_OBJS= ${_PROGS_COMMON_SRCS:M*.[dhly]}
.if !empty(_PROGS_COMMON_SRCS:N*.[dhly])
_PROGS_COMMON_OBJS+= ${_PROGS_COMMON_SRCS:N*.[dhly]:R:S/$/.o/g}
.endif
${PROGS}: ${_PROGS_COMMON_OBJS}
.endif
.for p in ${PROGS}
.if defined(PROGS_CXX) && !empty(PROGS_CXX:M$p)
# bsd.prog.mk may need to know this