git: 99feb137f5f6 - main - `make buildworld' with time logging for each stage

[Wolfram Schneider]

The branch main has been updated by wosch:

URL: https://cgit.FreeBSD.org/src/commit/?id=99feb137f5f66f903bba816c1d98ced2a92bef12

commit 99feb137f5f66f903bba816c1d98ced2a92bef12
Author:     Wolfram Schneider <wosch at FreeBSD.org>
AuthorDate: 2021-08-01 09:10:49 +0000
Commit:     Wolfram Schneider <wosch at FreeBSD.org>
CommitDate: 2021-08-01 09:10:49 +0000

    `make buildworld' with time logging for each stage
    
    PR:             257141
    Reviewed by:    sjg,emaste
    Approved by:    emaste
    Differential Revision:  https://reviews.freebsd.org/D31154
---
 Makefile.inc1      | 13 +++++++------
 Makefile.libcompat |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 9ef954e0678c..3d54a088d070 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -59,6 +59,7 @@ _MKSHOWCONFIG=	t
 
 SRCDIR?=	${.CURDIR}
 LOCALBASE?=	/usr/local
+TIME_ENV ?= time env
 
 .include "share/mk/src.tools.mk"
 
@@ -722,7 +723,7 @@ BSARGS= 	DESTDIR= \
 		MK_INCLUDES=yes
 
 BMAKE=		\
-		${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
+		${TIME_ENV} ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
 		${BSARGS}
 .if empty(.MAKEOVERRIDES:MMK_LLVM_TARGET_ALL)
 BMAKE+=		MK_LLVM_TARGET_ALL=no
@@ -730,7 +731,7 @@ BMAKE+=		MK_LLVM_TARGET_ALL=no
 
 # build-tools stage
 TMAKE=		\
-		${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
+		${TIME_ENV} ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		DESTDIR= \
 		BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \
@@ -754,7 +755,7 @@ KTMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		WORLDTMP=${WORLDTMP} \
 		MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
 
-KTMAKE=		\
+KTMAKE=		${TIME_ENV} \
 		TOOLS_PREFIX=${TOOLS_PREFIX_UNDEF:U${WORLDTMP}} \
 		${KTMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
 		DESTDIR= \
@@ -882,12 +883,12 @@ host-osreldate.h: # DO NOT ADD /usr/include/osreldate.h here
 	@echo "#endif" >> ${.TARGET}
 .endif
 
-WMAKE=		${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
+WMAKE=		${TIME_ENV} ${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
 		BWPHASE=${.TARGET:C,^_,,} \
 		DESTDIR=${WORLDTMP}
 
 IMAKEENV=	${CROSSENV}
-IMAKE=		${IMAKEENV} ${MAKE} -f Makefile.inc1 \
+IMAKE=		${TIME_ENV} ${IMAKEENV} ${MAKE} -f Makefile.inc1 \
 		${IMAKE_INSTALL} ${IMAKE_MTREE}
 .if empty(.MAKEFLAGS:M-n)
 IMAKEENV+=	PATH=${STRICTTMPPATH}:${INSTALLTMP} \
@@ -951,7 +952,7 @@ DESTDIR_MTREE=	${DISTR_MTREE} ${DESTDIR_MTREEFLAGS}
 
 # kernel stage
 KMAKEENV=	${WMAKEENV:NSYSROOT=*}
-KMAKE=		${KMAKEENV} ${MAKE} ${.MAKEFLAGS} ${KERNEL_FLAGS} KERNEL=${INSTKERNNAME}
+KMAKE=		${TIME_ENV} ${KMAKEENV} ${MAKE} ${.MAKEFLAGS} ${KERNEL_FLAGS} KERNEL=${INSTKERNNAME}
 
 #
 # buildworld
diff --git a/Makefile.libcompat b/Makefile.libcompat
index 779bcb163cf7..c400cef6fbe3 100644
--- a/Makefile.libcompat
+++ b/Makefile.libcompat
@@ -28,7 +28,7 @@ LIBCOMPATWMAKEFLAGS+= CC="${XCC} ${LIBCOMPATCFLAGS}" \
 		MK_CTF=no \
 		-DNO_LINT \
 		MK_TESTS=no
-LIBCOMPATWMAKE+=	${LIBCOMPATWMAKEENV} ${MAKE} ${LIBCOMPATWMAKEFLAGS} \
+LIBCOMPATWMAKE+=	${TIME_ENV} ${LIBCOMPATWMAKEENV} ${MAKE} ${LIBCOMPATWMAKEFLAGS} \
 			OBJTOP=${LIBCOMPAT_OBJTOP} \
 			OBJROOT='$${OBJTOP}/' \
 			MAKEOBJDIRPREFIX= \