diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-12-04 18:09:51 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-12-04 18:09:51 +0000 |
| commit | 327f92037dfdc3fca4c9cc4c83ce14b2abd2deab (patch) | |
| tree | 0fdecef0c70b5d5c4e83625456b10e611b63c74d | |
| parent | 40749e0509b3db80c692c6f9fd6a482c32607bd1 (diff) | |
| download | FreeBSD-src-327f92037dfdc3fca4c9cc4c83ce14b2abd2deab.zip FreeBSD-src-327f92037dfdc3fca4c9cc4c83ce14b2abd2deab.tar.gz | |
MFC r289669:
Fix building in a directory with SUBDIRs and SUBDIR_PARALLEL.
| -rw-r--r-- | share/mk/bsd.progs.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/share/mk/bsd.progs.mk b/share/mk/bsd.progs.mk index 984ac47..2253d8e 100644 --- a/share/mk/bsd.progs.mk +++ b/share/mk/bsd.progs.mk @@ -125,16 +125,18 @@ x.$p= PROG_CXX=$p # Main PROG target $p ${p}_p: .PHONY .MAKE - (cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \ - SUBDIR= PROG=$p \ + (cd ${.CURDIR} && \ + NO_SUBDIR=1 ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \ + PROG=$p \ DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \ ${x.$p}) # Pseudo targets for PROG, such as 'install'. .for t in ${PROGS_TARGETS:O:u} $p.$t: .PHONY .MAKE - (cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \ - SUBDIR= PROG=$p \ + (cd ${.CURDIR} && \ + NO_SUBDIR=1 ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \ + PROG=$p \ DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \ ${x.$p} ${@:E}) .endfor |
