Date: Tue, 24 Oct 2023 18:36:56 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: e949b671c555 - stable/14 - makeman: Use ${make} instead of plain make to compute ${requireds} Message-ID: <202310241836.39OIauDE087391@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e949b671c5550266ab88bd9d08e096af6a1550e4 commit e949b671c5550266ab88bd9d08e096af6a1550e4 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2023-09-08 23:36:52 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2023-10-24 17:01:07 +0000 makeman: Use ${make} instead of plain make to compute ${requireds} This is currently a no-op but can matter for downstreams whose ${make} includes additional settings. Reviewed by: imp, emaste Obtained from: CheriBSD Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D41777 (cherry picked from commit 9c80d66ec1b4c5b9ac7aaf5b0fdbb1628d49c181) --- tools/build/options/makeman | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build/options/makeman b/tools/build/options/makeman index ac5aaa8b8b03..4e44c78b0278 100755 --- a/tools/build/options/makeman +++ b/tools/build/options/makeman @@ -116,7 +116,7 @@ show() exit 1 ;; esac - requireds=`env -i make -f ${srcdir}/share/mk/src.opts.mk \ + requireds=`env -i ${make} -f ${srcdir}/share/mk/src.opts.mk \ -V '${__REQUIRED_OPTIONS:ts,}'` env -i ${make} .MAKE.MODE=normal "$@" showconfig __MAKE_CONF=/dev/null \ SRCCONF=/dev/null |
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310241836.39OIauDE087391>