diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-12-04 18:06:47 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-12-04 18:06:47 +0000 |
| commit | eae1434b51b71593308d6907ba66b4d39fc2dfae (patch) | |
| tree | e0c3e663c54380f5632b16a3b376f989dd210d41 /share | |
| parent | 241e144b762bd19011bee89a44c0a25cd7439148 (diff) | |
| download | FreeBSD-src-eae1434b51b71593308d6907ba66b4d39fc2dfae.zip FreeBSD-src-eae1434b51b71593308d6907ba66b4d39fc2dfae.tar.gz | |
MFC r289286,r291338,r291340:
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.
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/bsd.progs.mk | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/share/mk/bsd.progs.mk b/share/mk/bsd.progs.mk index 474dd31..968688a 100644 --- a/share/mk/bsd.progs.mk +++ b/share/mk/bsd.progs.mk @@ -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 |
