diff options
author | bdrewery <bdrewery@FreeBSD.org> | 2017-01-03 23:04:51 +0000 |
---|---|---|
committer | bdrewery <bdrewery@FreeBSD.org> | 2017-01-03 23:04:51 +0000 |
commit | f156cf7f474381c09fef820497b789e15c2cc86d (patch) | |
tree | 9e3ed4359bf53d056bbb3baafc7ffc4f1eba6149 /share | |
parent | 178d806282e8257ae41422de91567ce6e34ef6f3 (diff) | |
download | FreeBSD-src-f156cf7f474381c09fef820497b789e15c2cc86d.zip FreeBSD-src-f156cf7f474381c09fef820497b789e15c2cc86d.tar.gz |
MFC r308598:
DIRDEPS_BUILD: Don't hook 'beforebuild' into 'all' in MAKELEVEL 0.
Diffstat (limited to 'share')
-rw-r--r-- | share/mk/bsd.init.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/share/mk/bsd.init.mk b/share/mk/bsd.init.mk index 25ab762..70cf24b 100644 --- a/share/mk/bsd.init.mk +++ b/share/mk/bsd.init.mk @@ -15,10 +15,6 @@ __<bsd.init.mk>__: .endif .include <bsd.own.mk> .MAIN: all -beforebuild: .PHONY .NOTMAIN -.if !defined(_SKIP_BUILD) -all: beforebuild .WAIT -.endif .if ${.MAKE.LEVEL:U1} == 0 && ${BUILD_AT_LEVEL0:Uyes:tl} == "no" && !make(clean*) # this tells lib.mk and prog.mk to not actually build anything @@ -28,6 +24,11 @@ _SKIP_BUILD = not building at level 0 .warning ${_SKIP_BUILD} .endif +beforebuild: .PHONY .NOTMAIN +.if !defined(_SKIP_BUILD) +all: beforebuild .WAIT +.endif + .if ${MK_META_MODE} == "yes" .if !exists(/dev/filemon) && \ ${UPDATE_DEPENDFILE:Uyes:tl} != "no" && !defined(NO_FILEMON) && \ |