From nobody Tue Jul 1 12:29:54 2025 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 4bWj5v4t8Zz60LS5; Tue, 01 Jul 2025 12:29:55 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bWj5v1G87z3wB1; Tue, 01 Jul 2025 12:29:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751372995; 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=UP0tmPYGu0fZMuLVeALqeJ3snRZPplVNLxkF4nENf5U=; b=jhpT/MIUDWrD95kla3WmM5kgdEt4hyPFrom0qwWISw3PaVypICaGR7HIqLE7FNbTTaeZ06 Ln/KEZ8XFzmTlHAGtBFQkS5AdtgeB8s5vDd9eteVQJdi+5IHheyz8SwzGwZyHzj9j4rjzH 024vc/VD77E6w6zvejoo/LWaadlLwSGtW7MCGtbUtPv4OFTl7IgiIdXwAYPOkzj6VPCQ7/ uA6s93+uLoCfIvngS/dYFDmrdFXQt06an6+fl0pBBCNvmbimjv45rmdhqbeFJImpiVvOCL kJpRzg6Ge04WsvdArbU4ac5nuS+2YjK2igrd02ydneaPaSql8Fp8klep3y8UJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751372995; 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=UP0tmPYGu0fZMuLVeALqeJ3snRZPplVNLxkF4nENf5U=; b=On6kwCJ8hspx03g2KhQyPXzvU9Xzj+P4Op55GvuUEuSyfMkWuOD57Q6lBLuj4E4VgotPGW 8y5qPGATsyo9vEE5a61Ppxa2bDlq/3oE50TbZ4k/Dq8ZIxesGiy3gkJ+w49jUQeUbNnGT6 objsC8FFEd8ue1XOh91KgHMTRwKJ/oN3aAfjp9uAHDqc41edg4Vxd2YFBdC0zPd7tjLxjP pzBWiXst2nuDK6Zrd7vEvo6MvIKCBw7dwa5G7Ooe+nM7fxLOdUmUQUYIjyiyiIzDfbngB3 dY/50pixR2arBtQaa4PVPGsFuJXHuZH11rX4gPYpafqRThxfwx0B/hTDPvT4Vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751372995; a=rsa-sha256; cv=none; b=eUknzMy3VtFom2I6ltT9MHXgQzdAaRC21J6X02SLorO+fQEgXqRVsG0qltmAq0iwlPMRhO Nu9ptHZ7QrcY77GGmaOwRexYLNsSmmxuUr4ebCmi5RycV+eiuhB+74byZYOFsgvR3s2JA0 yUDueDhIDmjhVHVYJ1g5kYFBIQHk2MWOjCwNr2M+rBJnGUpxvVuqJMzm8wclKfGoT0Zsas P2bZ32Pak+3pNfweY6wSaHzfuIebqyLF5+w/WKcsV9keXPQpb+PFNq1+ydOzMxdqLXjlXd bQ5/7UzgSNxvzZkUBml7xYbQapra6bsneLv1TLuiAKzdDzxwctjfgfSMCOkEHA== 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 4bWj5v0N76zbDs; Tue, 01 Jul 2025 12:29:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 561CTspJ068812; Tue, 1 Jul 2025 12:29:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 561CTs2F068809; Tue, 1 Jul 2025 12:29:54 GMT (envelope-from git) Date: Tue, 1 Jul 2025 12:29:54 GMT Message-Id: <202507011229.561CTs2F068809@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 5d0cf80f4501 - main - Makefile.inc1: Always have which succeed 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d0cf80f4501fb297bc546b624a0e527040a1843 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=5d0cf80f4501fb297bc546b624a0e527040a1843 commit 5d0cf80f4501fb297bc546b624a0e527040a1843 Author: Andrew Turner AuthorDate: 2025-06-28 01:55:41 +0000 Commit: Andrew Turner CommitDate: 2025-06-28 01:55:59 +0000 Makefile.inc1: Always have which succeed In bootstrap-tools we search for some tools to copy into the obj tree. If the tool is missing in the host environment then the '[ ! -e ... ]' check will fail as which will print ' not found'. There is an issue that which will also return an error so we never get to the check and don't print the error message. As which outputs an invalid path on failure we can just add || true to ensure make continues. Reviewed by: kevans Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D51075 --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index e7b1a2d7acb9..d366be09f497 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2758,7 +2758,7 @@ ${_bt}-links: .PHONY .for _tool in ${_bootstrap_tools_links} ${_bt}-link-${_tool}: .PHONY @rm -f "${WORLDTMP}/legacy/bin/${_tool}"; \ - source_path=`which ${_tool}`; \ + source_path=`which ${_tool} || true`; \ if [ ! -e "$${source_path}" ] ; then \ echo "Cannot find host tool '${_tool}'"; false; \ fi; \