aboutsummaryrefslogtreecommitdiff
path: root/mk/meta.subdir.mk
diff options
context:
space:
mode:
authorSimon J. Gerraty <sjg@FreeBSD.org>2021-01-14 01:24:34 +0000
committerSimon J. Gerraty <sjg@FreeBSD.org>2021-01-14 01:24:34 +0000
commit8e11a9b4250be3c3379c45fa820bff78d99d5946 (patch)
treeea4954dbe7647b6211a20458b2a881e3d943639f /mk/meta.subdir.mk
parent1b65f0bd2bda7121a90f8cb4c1cacaa20f1b681d (diff)
downloadsrc-8e11a9b4250be3c3379c45fa820bff78d99d5946.tar.gz
src-8e11a9b4250be3c3379c45fa820bff78d99d5946.zip
Import bmake-20210110vendor/NetBSD/bmake/20210110
Quite a lot of churn on style, but lots of good work refactoring complicated functions and lots more unit-tests. Thanks mostly to rillig at NetBSD Some interesting entries from ChangeLog o .MAKE.{UID,GID} represent uid and gid running make. o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable checks in InitObjdir. Explicit .OBJDIR target always allows read-only directory. o add more unit tests for META MODE Change-Id: I4d3bcf08b4c864d98b343f602efe5a75dbfa7a94
Diffstat (limited to 'mk/meta.subdir.mk')
-rw-r--r--mk/meta.subdir.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/meta.subdir.mk b/mk/meta.subdir.mk
index 39cf875d6b77..d9caae4edbcc 100644
--- a/mk/meta.subdir.mk
+++ b/mk/meta.subdir.mk
@@ -1,4 +1,4 @@
-# $Id: meta.subdir.mk,v 1.12 2020/08/19 17:51:53 sjg Exp $
+# $Id: meta.subdir.mk,v 1.13 2021/01/05 22:24:37 sjg Exp $
#
# @(#) Copyright (c) 2010, Simon J. Gerraty
@@ -17,7 +17,7 @@
.if !defined(NO_SUBDIR) && !empty(SUBDIR)
.if make(destroy*) || make(clean*)
.MAKE.MODE = compat
-.if !commands(destroy)
+.if !commands(obj)
.-include <bsd.obj.mk>
.endif
.elif ${.MAKE.LEVEL} == 0