From nobody Sun Jan 29 23:53:11 2023 X-Original-To: dev-commits-src-main@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 4P4p6H5HwZz3bMtT; Sun, 29 Jan 2023 23:53:11 +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 4P4p6H4vBrz43XQ; Sun, 29 Jan 2023 23:53:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675036391; 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=w/6P8ZVSjrmCza2t9OroGZ5QbFqnCNIxB75P5Emo00g=; b=oG6kqP9CLJAj62K+ujO0PLlz8Lx3pTJL9f7k2WlC1eMUppDHFVP2Wyla48Lryz5/fqDPVc 0EMz87UjjZjiN5yK41ujCwon2tQVWMaxaaLE6RfWLNpncZvg308xDEpWCGRbGqSnRjE3l/ tuMtCArkWCT2rMH5gVhXBA+N0IhCYpIcwb2SXG5HMBrkPz1GONfTUkEqpY+C5VZPKAOKmK o17RH4NxtFvAhvpTu5qM6X/9gccoDSrez5kqfa1un9ZKQP/Vo7IlsF7losp2ZjXhz/1ZRM iabNlp1BMtd0x4IVrzm7qyiH9SwnTKzCHtQxcGd37YIx2s6xIRzFFhM7GSBOpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675036391; 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=w/6P8ZVSjrmCza2t9OroGZ5QbFqnCNIxB75P5Emo00g=; b=rufnHxdST+sU67EGGjxJrHhZ1xldQcvEqBYc/cH5QICLGHQSj2pl+6glm2DdVzxeU7cE6w ncRRvYA2HKNA2lLYWkfUyuOjyVzIaT17xGc4uEN0GqGPvHZr531qSypnPe8iZT6HsoOLWD fQon/T/LpRKPY9rcljErCtAaqd+JZgmH9OfHAaf4ok/wOSEpEi1Mj8Id7pbEGt/j9d/5wE feXV/m++SrSdZtu41FFfOk7anReyM8TodsTb0OdErg/rQWpp3kvOIJ45j9nldnaiH33YKr pTINamZmI2fTInayCOrONpocj/NkK3DhFenR0cKRajLfSYwKWCqcTFm2KxGGMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675036391; a=rsa-sha256; cv=none; b=uf2iIv35YKVqE0ht582ymDkW8kyrKOi8n0IqbMkYOR0ZjqwswNf0YwinlE8ja7HFQsH4x8 nuwWj98x6CXGfi7viJ0qfXG7qvYXbZV+POh+KlA8HMRDHJRIJwwybiMsqjNHlSXBC1Oo8O vuMcbau2a9CPP/a5ePxE/za9NgYQa2EC3+TSFgsdQEHDMg5x+IE+uyZejK+UO0kOLkDZZO JuKGuxViylSpRoB4CmI+svtEtCmMa8BYT5RIbt+X4bhbEDXHmtO4wJOstsLkoGR7quL5JB 2P9Do59i7AUiv6c9+BSCsfG/AWA0Bj18HeQ31LtnlyX5fNE5gqXg/d7SmWn9Gg== 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 4P4p6H3cWGzmsB; Sun, 29 Jan 2023 23:53:11 +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 30TNrBRa020478; Sun, 29 Jan 2023 23:53:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30TNrBhA020477; Sun, 29 Jan 2023 23:53:11 GMT (envelope-from git) Date: Sun, 29 Jan 2023 23:53:11 GMT Message-Id: <202301292353.30TNrBhA020477@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 4ebd18cf357a - main - Makefile.inc1: Print the right PATH for missing install tool error List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ebd18cf357af71941675ff3ae7fb3bf56a37e0e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=4ebd18cf357af71941675ff3ae7fb3bf56a37e0e commit 4ebd18cf357af71941675ff3ae7fb3bf56a37e0e Author: Jessica Clarke AuthorDate: 2023-01-29 23:45:49 +0000 Commit: Jessica Clarke CommitDate: 2023-01-29 23:53:04 +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") --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index ae50cdda508f..dfc9cb8d07fc 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1371,7 +1371,7 @@ distributeworld installworld stageworld: _installcheck_world .PHONY if progpath=`env PATH=${TMPPATH:Q} 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); \