diff options
| author | sjg <sjg@FreeBSD.org> | 2015-05-30 17:29:51 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2015-05-30 17:29:51 +0000 |
| commit | 7d4877ba08cdb7270fb64dea24fcdef1fc0e1c0d (patch) | |
| tree | 210a84ebe06ce69239d2e61c6df9d566cd4c1b37 /share | |
| parent | 51262d20a186443b9b658ac5e457919f92ee1d87 (diff) | |
| download | FreeBSD-src-7d4877ba08cdb7270fb64dea24fcdef1fc0e1c0d.zip FreeBSD-src-7d4877ba08cdb7270fb64dea24fcdef1fc0e1c0d.tar.gz | |
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.
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/bsd.progs.mk | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/share/mk/bsd.progs.mk b/share/mk/bsd.progs.mk index 46abbb3..f943678 100644 --- a/share/mk/bsd.progs.mk +++ b/share/mk/bsd.progs.mk @@ -62,8 +62,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 +93,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 |
