diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-12-04 07:54:16 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-12-04 07:54:16 +0000 |
| commit | 184f96813c42e237b787bbd6af618861799a50dc (patch) | |
| tree | 1e89aa98bf83d9d1dee35eef8cda68d524b6422b | |
| parent | 7ba2a793e63da5a34fb7b3024519af7286be7531 (diff) | |
| download | FreeBSD-src-184f96813c42e237b787bbd6af618861799a50dc.zip FreeBSD-src-184f96813c42e237b787bbd6af618861799a50dc.tar.gz | |
The .if redirection on .WAIT is no longer needed with bmake.
Sponsored by: EMC / Isilon Storage Division
| -rw-r--r-- | share/mk/bsd.subdir.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk index 68096ac..dc1dbbf 100644 --- a/share/mk/bsd.subdir.mk +++ b/share/mk/bsd.subdir.mk @@ -113,8 +113,6 @@ ${SUBDIR:N.WAIT}: .PHONY .MAKE dir=${.TARGET}; \ ${_SUBDIR_SH}; -# Work around parsing of .if nested in .for by putting .WAIT string into a var. -__wait= .WAIT .for __target in ${ALL_SUBDIR_TARGETS} # Only recurse on directly-called targets. I.e., don't recurse on dependencies # such as 'install' becoming {before,real,after}install, just recurse @@ -131,7 +129,7 @@ _is_standalone_target= 0 .if defined(SUBDIR_PARALLEL) || ${_is_standalone_target} == 1 __subdir_targets= .for __dir in ${SUBDIR} -.if ${__wait} == ${__dir} +.if ${__dir} == .WAIT __subdir_targets+= .WAIT .else __subdir_targets+= ${__target}_subdir_${__dir} |
