diff options
author | Simon J. Gerraty <sjg@FreeBSD.org> | 2015-06-11 21:11:33 +0000 |
---|---|---|
committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2015-06-11 21:11:33 +0000 |
commit | ab21b9ab84ffbfa9515a64a3dd03e61eecead694 (patch) | |
tree | d1b4a1b77e7331919e1ec5d7cca9fb01ad9aba1b /share/mk/bsd.progs.mk | |
parent | d083cb11046d63bde69a1b81d9cd662683c962a1 (diff) | |
download | src-ab21b9ab84ffbfa9515a64a3dd03e61eecead694.tar.gz src-ab21b9ab84ffbfa9515a64a3dd03e61eecead694.zip |
Do not override variables on command line that build needs to change.
It is sufficient to explicitly set DEPENDFILE in env for each sub-make.
Notes
Notes:
svn path=/head/; revision=284288
Diffstat (limited to 'share/mk/bsd.progs.mk')
-rw-r--r-- | share/mk/bsd.progs.mk | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/share/mk/bsd.progs.mk b/share/mk/bsd.progs.mk index 46abbb3fc165..123743922e87 100644 --- a/share/mk/bsd.progs.mk +++ b/share/mk/bsd.progs.mk @@ -22,14 +22,10 @@ PROGS += ${PROGS_CXX} # In meta mode, we can capture dependenices for _one_ of the progs. # if makefile doesn't nominate one, we use the first. -.if defined(.PARSEDIR) .ifndef UPDATE_DEPENDFILE_PROG UPDATE_DEPENDFILE_PROG = ${PROGS:[1]} .export UPDATE_DEPENDFILE_PROG .endif -.else -UPDATE_DEPENDFILE_PROG?= no -.endif .ifndef PROG # They may have asked us to build just one @@ -62,8 +58,6 @@ UPDATE_DEPENDFILE ?= yes .endif UPDATE_DEPENDFILE ?= NO -# ensure that we don't clobber each other's dependencies -DEPENDFILE?= .depend.${PROG} # prog.mk will do the rest .else all: ${FILES} ${PROGS} ${SCRIPTS} @@ -95,17 +89,17 @@ x.$p= PROG_CXX=$p .endif $p ${p}_p: .PHONY .MAKE - (cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \ - SUBDIR= PROG=$p \ - DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \ - ${x.$p}) + (cd ${.CURDIR} && \ + DEPENDFILE=.depend.$p \ + ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \ + SUBDIR= PROG=$p ${x.$p}) .for t in ${PROGS_TARGETS:O:u} $p.$t: .PHONY .MAKE - (cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \ - SUBDIR= PROG=$p \ - DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \ - ${x.$p} ${@:E}) + (cd ${.CURDIR} && \ + DEPENDFILE=.depend.$p \ + ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \ + SUBDIR= PROG=$p ${x.$p} ${@:E}) .endfor .endfor |