svn commit: r304006 - head

Bryan Drewery bdrewery at FreeBSD.org
Fri Aug 12 13:52:52 UTC 2016


Author: bdrewery
Date: Fri Aug 12 13:52:51 2016
New Revision: 304006
URL: https://svnweb.freebsd.org/changeset/base/304006

Log:
  Avoid showing the bootstrap make command for check-old, etc.
  
  Reported by:	koobs
  MFC after:	1 week
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/Makefile
  head/Makefile.inc1

Modified: head/Makefile
==============================================================================
--- head/Makefile	Fri Aug 12 11:06:54 2016	(r304005)
+++ head/Makefile	Fri Aug 12 13:52:51 2016	(r304006)
@@ -209,7 +209,8 @@ SUB_MAKE= `test -x ${MYMAKE} && echo ${M
 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.

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri Aug 12 11:06:54 2016	(r304005)
+++ head/Makefile.inc1	Fri Aug 12 13:52:51 2016	(r304006)
@@ -2378,11 +2378,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
 


More information about the svn-src-all mailing list