From nobody Fri Sep 08 23:37:16 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 4RjCFT1mpsz4sd00; Fri, 8 Sep 2023 23:37:17 +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 4RjCFS64fdz4YTg; Fri, 8 Sep 2023 23:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694216236; 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=meF95dFA6RPds2rvEBxGU904DjFu5aiU3so0C5xfNC0=; b=otSSxE0nGjzWCq5OgqXISqhV5OurZxamgpgI43D0kOGUBdGm5KyBNMjQQrh9xj4iyNVpUf HTGAL1+bkwG9B4r7XMwPLnp+mPuW2Kyurwbnvy8BOK/THqQaO4FDzdzoMEtgkJHx2GHc36 8n5LCJydgA23f0eYq8YHRRlUBIKh0OB0rwjQ6ejwO+T7WQSY7QKeOMTUKYMhHXEqWqt2+w St9Z8Rr4rNW01yCzk5pbY5lDDI70S/r2AlBVt38nc0cYA6qoLwLYbkoT4Gd2ipmbMmnjJE tE1YCYr34dkGF0ijpzHZZukUEvC2oItR1VOCyEvau7CK7oz9/vCQWTby//4lWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694216236; a=rsa-sha256; cv=none; b=EQYerFR8vkfnYl1gAlMPkwibNPBXxjE4IndC7ltLsS2xauB77uHK9/V9QIKGiDR/dGPTNL g8AXaO9IQKDAK+/nZSmqNv3N4gS3R/vbhyac9xk/QNhu/tyjKihpXW93JjArt/t9O4uQfP xdsvkHjm8WMA6HK+lx1cWyj0aOojw06bT9KR6hYnLdQUWzymfzdbF4MNsvHkTgEpiTjgX1 xMyqCZIj5JsiMDCfpV74jIPGTGdkMfAAZhVE+N4wNnIQ1Na/zX/ubkQQW3OY7svzL61zcZ NH8OCTL2uxbNk3YqM3hPTOqsMbIL44s4YP3W1RYBvwxuys4eEAWC2JuKwd3S7w== 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=1694216236; 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=meF95dFA6RPds2rvEBxGU904DjFu5aiU3so0C5xfNC0=; b=ZzBz26kjUNtA34r4BIjGV8JxuTlUJA8owLXfiilJX1VirqwfWQKlL9uq2hwIcyvqZoHQRG HOcVrG/TkyX0zIaHHJkx4asmSECg57cYcFMNJJ33oJoUq+n/OJH7uOHhAz4se4qT2arW7e PJ5nYZtxilyxhwQMynbNxJmfqSs1bMN8I14m/LVC8UrP4KsSlkUn8pDrECKSGtjuhCfidX qT27JyvAlMh9UPa0ujrMgSXWEWAQHUr3Zqh8IScmcMOZluqwVrwdPfG5L92rNw4YkRWN27 KaxrZC9BqVUuN6wg5uby+08xrhKZxdvIcNlwkytUVDPJHEXUV1XkH2QZPeXv5Q== 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 4RjCFS4J4vz125s; Fri, 8 Sep 2023 23:37:16 +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 388NbGev073256; Fri, 8 Sep 2023 23:37:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388NbGCx073253; Fri, 8 Sep 2023 23:37:16 GMT (envelope-from git) Date: Fri, 8 Sep 2023 23:37:16 GMT Message-Id: <202309082337.388NbGCx073253@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 9c80d66ec1b4 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 9c80d66ec1b4c5b9ac7aaf5b0fdbb1628d49c181 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9c80d66ec1b4c5b9ac7aaf5b0fdbb1628d49c181 commit 9c80d66ec1b4c5b9ac7aaf5b0fdbb1628d49c181 Author: John Baldwin AuthorDate: 2023-09-08 23:36:52 +0000 Commit: John Baldwin CommitDate: 2023-09-08 23:36:52 +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 --- 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 f4089d453801..30416b03b983 100755 --- a/tools/build/options/makeman +++ b/tools/build/options/makeman @@ -127,7 +127,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 |