From nobody Tue Jan 31 09:46:47 2023 X-Original-To: dev-commits-src-branches@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 4P5gDl5HTnz3c0lR; Tue, 31 Jan 2023 09:46:47 +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 4P5gDl4k2Kz4FtQ; Tue, 31 Jan 2023 09:46:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675158407; 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=KZ33vU7R/xpwFlPe1tUd3MwAkpEF6I1vC8FAQAIC83Q=; b=VFTbyIp8ThJdSDODe0wzHVwJE1hLDxveZtZ9v6AY8UEydVNtfJYwhxD1IXzQPzXp9vasl+ KWdnZeNl90G4bQcceMLKuhKm87MYkXFDpVzo55iEhRyr5Lje8sqXl/YAbOLOy2hb8UWGJ4 grliQukLKai5FjFKxnEeeghipghyGwRrGkckJ+Z997ugnmQP8a9+gQI7lMXDxyAyyTV3NM g3FHhMFeekECTKeLFcDMldpYxjk4wGlWzHuYlTsrMQQlKre5zrSeuByppdH8g/SybiNhaX 0k6snkAittHwzdUSDycPyCMHhAW2Up7WGsf/sbOfC05wvwTyjZGa8kt8jCf+/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675158407; 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=KZ33vU7R/xpwFlPe1tUd3MwAkpEF6I1vC8FAQAIC83Q=; b=Rf//wVwzSB2zJTgio2NDKWHmaZByTcSeSCwx/+yZC0KVoP3c0nvauvSdHBXgFZahXzlZXS mc7jv7S2rV/zNUpeDMEsrnNm45+fxEblLK4CT8By23Cs+bLAsqnuuz/1ZmZUJSPmyfJ9BT tf4saHyG87bWko9xWz9fOQ9Iz3fzYMV0bgWSnBpu1zSlF/vwBh+VNt0cCTAgc6BPSMypcZ 2LqyjH3uauuez3Jt0RoHkBXg+pSqbxEkq40TxgECY0VbGPc0A+RUZQce3+cj3rfouYYIMP bbVsmcSxt/hogoFGUJozIu7jheqvpSFcUlpGZLuxPssP6WP5TRbn9MFB+9NvzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675158407; a=rsa-sha256; cv=none; b=PM854X89m5iqbO72zPhkTxcu1FJvRdMUWXwUqC+kczXIoZwHRNWENYa+Cqg7CR74lLaeQE QXQ8c1Ec1sY/V8euoNfwdbjoh0dkm23qvzuHud3tH/slQDipkFdGh3ZCdy0WKPfSRJYVUY 5xU6tmniO0uyD+mBIXkxBwlOQRH12Gp5Lfn2/2lTN63HP9eQNcOyvC0VP5BQ3Zk/2DxJkh WunPT1jd/p79Jekvc+qVoRLQDH4yXnj85KHAIwhmv0eENatfrHQ0YziKcljIK5VxaOo9pv UOmu1SQFbM1QrPe8IS/0X1y2SEIGZxYRiasgPQE/1dnmF0vxaGZpk2jFphTFUQ== 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 4P5gDl3dTzzkZt; Tue, 31 Jan 2023 09:46:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30V9klB4041274; Tue, 31 Jan 2023 09:46:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30V9klA2041273; Tue, 31 Jan 2023 09:46:47 GMT (envelope-from git) Date: Tue, 31 Jan 2023 09:46:47 GMT Message-Id: <202301310946.30V9klA2041273@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 3901be6a14ce - stable/13 - Makefile.inc1: Print the right PATH for missing install tool error List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3901be6a14ceff43e502903e56eee98e86a1af0a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3901be6a14ceff43e502903e56eee98e86a1af0a commit 3901be6a14ceff43e502903e56eee98e86a1af0a Author: Jessica Clarke AuthorDate: 2023-01-29 23:45:49 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-01-31 09:44:19 +0000 Makefile.inc1: Print the right PATH for missing install tool error We override PATH for which but then go and print the non-overridden PATH, which leads to rather confusing messages. Fixes: 5bb9250e0af4 ("Add necessary Makefile.inc1 infrastructure for building on non-FreeBSD") (cherry picked from commit 4ebd18cf357af71941675ff3ae7fb3bf56a37e0e) --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index a3858b25d154..86f59040ac1d 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1376,7 +1376,7 @@ distributeworld installworld stageworld: _installcheck_world .PHONY if progpath=`env PATH=${TMPPATH} which $$prog`; then \ echo $$progpath; \ else \ - echo "Required tool $$prog not found in PATH ($$PATH)." >&2; \ + echo "Required tool $$prog not found in PATH ("${TMPPATH:Q}")." >&2; \ exit 1; \ fi; \ done); \