summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsjg <sjg@FreeBSD.org>2013-06-14 16:30:11 +0000
committersjg <sjg@FreeBSD.org>2013-06-14 16:30:11 +0000
commita6ae521803aaf366df94a4867f223aab2212a0cf (patch)
tree317c547b327a7d5350246671986e0bdfaed1193c
parentf0e9b38d901f7b5f89a9625f9e3ae79ec4fb14c9 (diff)
downloadFreeBSD-src-a6ae521803aaf366df94a4867f223aab2212a0cf.zip
FreeBSD-src-a6ae521803aaf366df94a4867f223aab2212a0cf.tar.gz
Flag recursive make targets with .MAKE
so that job token pipe is passed to them. To avoid surprising anyone, only add .MAKE to ${TGTS} when -n has not been specified (at least for Makefile). Reviewed by: obrien
-rw-r--r--Makefile6
-rw-r--r--Makefile.inc12
2 files changed, 8 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 5ff68a8..b3015c5 100644
--- a/Makefile
+++ b/Makefile
@@ -209,6 +209,12 @@ cleanworld:
# Handle the user-driven targets, using the source relative mk files.
#
+.if empty(.MAKEFLAGS:M-n)
+# skip this for -n to avoid changing previous behavior of
+# 'make -n buildworld' etc.
+${TGTS}: .MAKE
+.endif
+
${TGTS}:
${_+_}@cd ${.CURDIR}; ${_MAKE} ${.TARGET}
diff --git a/Makefile.inc1 b/Makefile.inc1
index 78f98e8..2b49ab8 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1890,3 +1890,5 @@ _xi-links:
xdev xdev-build xdev-install:
@echo "*** Error: Both XDEV and XDEV_ARCH must be defined for \"${.TARGET}\" target"
.endif
+
+buildkernel ${WMAKE_TGTS} ${.ALLTARGETS:M_*}: .MAKE
OpenPOWER on IntegriCloud