git: f37724399606 - main - release: Forward ${MAKE} to etcupdate via the new -m flag
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 09 Aug 2022 21:59:05 UTC
The branch main has been updated by jrtc27:
URL: https://cgit.FreeBSD.org/src/commit/?id=f377243996062859b7fc011943aa781333843c32
commit f377243996062859b7fc011943aa781333843c32
Author: Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2022-08-09 21:57:01 +0000
Commit: Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2022-08-09 21:57:01 +0000
release: Forward ${MAKE} to etcupdate via the new -m flag
This is in preparation for non-FreeBSD builds where make is GNU make and
so etcupdate needs to know the name of or path to the bmake binary to
use for its own builds.
Reviewed by: gjb
Obtained from: CheriBSD
Differential Revision: https://reviews.freebsd.org/D35855
---
release/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/release/Makefile b/release/Makefile
index c8639b43a3be..fe932b3d1a76 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -124,7 +124,7 @@ base.txz:
"TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} ${.MAKE.JOBS:D-j${.MAKE.JOBS}}" \
-D "${.OBJDIR}/${DISTDIR}/base"
sh ${WORLDDIR}/usr.sbin/etcupdate/etcupdate.sh extract -B \
- -M "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" \
+ -m "${MAKE}" -M "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" \
-s ${WORLDDIR} -d "${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate"
.endif
# Package all components