summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2016-08-19 17:01:13 +0000
committerbdrewery <bdrewery@FreeBSD.org>2016-08-19 17:01:13 +0000
commite161da2b108e20916e78676801e9294d48effa15 (patch)
tree421e58986fa1aae5363ab1f099023a0e64f74f66
parentd7d309ad644177681ea34fce004922c6cbd64aa3 (diff)
downloadFreeBSD-src-e161da2b108e20916e78676801e9294d48effa15.zip
FreeBSD-src-e161da2b108e20916e78676801e9294d48effa15.tar.gz
MFC r304006:
Avoid showing the bootstrap make command for check-old, etc.
-rw-r--r--Makefile3
-rw-r--r--Makefile.inc16
2 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 26f98ca..0ae57c5 100644
--- a/Makefile
+++ b/Makefile
@@ -209,7 +209,8 @@ SUB_MAKE= `test -x ${MYMAKE} && echo ${MYMAKE} || echo ${MAKE}` \
SUB_MAKE= ${MAKE} -m ${.CURDIR}/share/mk
.endif
-_MAKE= PATH=${PATH} ${SUB_MAKE} -f Makefile.inc1 TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH}
+_MAKE= PATH=${PATH} MAKE_CMD=${MAKE} ${SUB_MAKE} -f Makefile.inc1 \
+ TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH}
# Only allow meta mode for the whitelisted targets. See META_TGT_WHITELIST
# above.
diff --git a/Makefile.inc1 b/Makefile.inc1
index cfd9076..7f50ee1 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2372,11 +2372,11 @@ check-old-dirs: .PHONY
done
delete-old: delete-old-files delete-old-dirs .PHONY
- @echo "To remove old libraries run '${MAKE} delete-old-libs'."
+ @echo "To remove old libraries run '${MAKE_CMD} delete-old-libs'."
check-old: check-old-files check-old-libs check-old-dirs .PHONY
- @echo "To remove old files and directories run '${MAKE} delete-old'."
- @echo "To remove old libraries run '${MAKE} delete-old-libs'."
+ @echo "To remove old files and directories run '${MAKE_CMD} delete-old'."
+ @echo "To remove old libraries run '${MAKE_CMD} delete-old-libs'."
.endif
OpenPOWER on IntegriCloud