The branch main has been updated by sjg:
URL:
https://cgit.FreeBSD.org/src/commit/?id=3717484168eea22f318658d46b1d59257c0cce4d
commit 3717484168eea22f318658d46b1d59257c0cce4d
Author: Simon J. Gerraty <s...@freebsd.org>
AuthorDate: 2025-07-21 16:11:44 +0000
Commit: Simon J. Gerraty <s...@freebsd.org>
CommitDate: 2025-07-21 16:11:44 +0000
bsd.subdir.mk skip _SUBDIR for DIRDEPS_BUILD
For DIRDEPS_BUILD we want to ignore _SUBDIR regardless of
.MAKE.LEVEL
Reviewed by: stevek
Differential Revision: https://reviews.freebsd.org/D51454
---
share/mk/bsd.subdir.mk | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk
index cf19c9d66201..289e3d591c8c 100644
--- a/share/mk/bsd.subdir.mk
+++ b/share/mk/bsd.subdir.mk
@@ -76,13 +76,14 @@ obj: .PHONY
.endif
.if !defined(NEED_SUBDIR)
+.if ${MK_DIRDEPS_BUILD} == "yes"
+# ignore this
+_SUBDIR:
# .MAKE.DEPENDFILE==/dev/null is set by bsd.dep.mk to avoid reading
# Makefile.depend
-.if ${.MAKE.LEVEL} == 0 && ${MK_DIRDEPS_BUILD} == "yes" && !empty(SUBDIR) && \
- ${.MAKE.DEPENDFILE} != "/dev/null"
+.if ${.MAKE.LEVEL} == 0 && !empty(SUBDIR) && ${.MAKE.DEPENDFILE} != "/dev/null"
.include <meta.subdir.mk>
-# ignore this
-_SUBDIR:
+.endif
.endif
.endif
