From nobody Tue Oct 24 18:36:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFLPj1P7Qz4yM3m; Tue, 24 Oct 2023 18:36:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SFLPj0l58z3XqN; Tue, 24 Oct 2023 18:36:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5tuBSTbHLmiG0JQLIqVXaDQpzZkmjQtA58mvi5KU+Xo=; b=nNky3ak+Wrto7bT5xJLmmXJMKjji3TPiRpZgJSQj5TorsM7Oqhz7ReSULPTh4JrGmV1akf zSB161jsL9zdJHTJQpt4B/fUG+pxpOpxbiihvA2ZTlVUPk/MxvSCgmGIzbfm5HO81jKRJt 5+zP9nzYuf63w8vdlyu7JZjnvTRreSwS5Q4gVdSgXZ091LXYyq/UMUNJ472FPF0V3KF4q5 k9dvH8JSnDozaJulKyRywEXt7FM3uTMnczNMn38+7XSVoKYsuJHUHi65i86bIFEEoamMxT kkPrP9CQ1rLTeY/62TsXaBD4ysbAY9RX1gCm9Ahzgn6rEluyDqi7OPtnFfxaDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698172617; a=rsa-sha256; cv=none; b=DCqu3S48VvB0RNv+y/xhg+QDuyUtShIACUBunsutxXigVJxF6Gy/IX8Q8teJHW4q27O8fs zrBMa2RWHeM8QzukhPO4dsja9VvcV1PJcKi+5VKZkdhcVZqqWRn3ygWC0hSsqqPgxdGpzG sxxGgT1xtLoa9bIrj7cCJIZZqF/vi4mcI9qUrS2cSkqI/zIyBHg59inNg1rruL/1swzw6W M8l3bVRUe1G3kvePg3m1pTeCIniXAtKG7tU31OIVU9de6/Z/uu2+/jlQH4UzU0GnDNygjT Q9L8MVzFHZMlqBXNgZPo0CvLgWSkPTwGS5CA09Av8cHynB8R5ZUseTu0EEEtFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5tuBSTbHLmiG0JQLIqVXaDQpzZkmjQtA58mvi5KU+Xo=; b=hpMpxm23GR5j5tcoe8QFroETVAXqRYHYIPpi49yACs7dhhvIbEC0A0ovqVue0Nxr3Jck8l ed5uTwKpj8Ld0BNLgJ9vbCgEx6r1282dMMJgYEgad2K+coB3SLpy0iXxxiND9tEMb5jrfs +oJ4xZyujkxYTVJBzKdCTeVGCR8j/ZWQjqQgOGRknpc/R8C2aYciP3aPmWlZaNZGCUU2UK K+nHeMfbwM14SlVKc9k4DSs9Muw/NxPuD0cL99Vj9XZ12KbYc+n0sj1iB1MqzTb2dRWuPJ F6JjHdneu3Ocw8UlO3V5NT+OJV530e+RBIVv+49Nad//vWVdb6FlXq/JlgUBrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFLPh6gDlzYmL; Tue, 24 Oct 2023 18:36:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39OIaufI087394; Tue, 24 Oct 2023 18:36:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OIauDE087391; Tue, 24 Oct 2023 18:36:56 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:36:56 GMT Message-Id: <202310241836.39OIauDE087391@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: e949b671c555 - stable/14 - makeman: Use ${make} instead of plain make to compute ${requireds} List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e949b671c5550266ab88bd9d08e096af6a1550e4 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e949b671c5550266ab88bd9d08e096af6a1550e4 commit e949b671c5550266ab88bd9d08e096af6a1550e4 Author: John Baldwin AuthorDate: 2023-09-08 23:36:52 +0000 Commit: John Baldwin 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 |