Use the right depend file for each program.
bsd.progs.mk generates a separate depend file for every program being built, but then it does not properly tell each submake to use those individual files. Properly propagate the depend file to use. Discovered while preparing the update of atf to 0.21 and noticing that the test programs were not being relinked to the new library. This change is "make tinderbox" clean.
This commit is contained in:
parent
10cb24248a
commit
30175d7650
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=273873
@ -90,12 +90,16 @@ x.$p= PROG_CXX=$p
|
||||
|
||||
$p ${p}_p: .PHONY .MAKE
|
||||
(cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \
|
||||
SUBDIR= PROG=$p ${x.$p})
|
||||
SUBDIR= PROG=$p \
|
||||
DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \
|
||||
${x.$p})
|
||||
|
||||
.for t in ${PROGS_TARGETS:O:u}
|
||||
$p.$t: .PHONY .MAKE
|
||||
(cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \
|
||||
SUBDIR= PROG=$p ${x.$p} ${@:E})
|
||||
SUBDIR= PROG=$p \
|
||||
DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \
|
||||
${x.$p} ${@:E})
|
||||
.endfor
|
||||
.endfor
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user