From nobody Tue Oct 07 18:17:05 2025 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 4ch49F54wfz6BlCD; Tue, 07 Oct 2025 18:17:05 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ch49F4VMWz3sTR; Tue, 07 Oct 2025 18:17:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759861025; 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=+FTI3megy0JunTZGY0xgsrEfdqHu3hlDp5cuirADp/s=; b=VONEAW8N27H3YdFADYlcQ1mhJcZIqUQ6Mpzye1ZCt7brxU/lC+kANXQ1b7jFRmDXWbIwZJ qz8KZ9KT0xYfiPapXhnrGQltkPjO6tZO6Bc4hLXxMfo3xsdZlGwn1bSFZ97yOPJ8NwXjKN BWNus4MHhE0xpl8KTUpXCFoufMzg/yV4PzGkgccfKs85EpzoQcvEIT4iPpJkhFNy9qPKfX l+DuoMLrCJcsebJ4UaZCY11tLXnKuGKJC3fTXLVd56TJhks0C2mJ/bU4Ljf2OTDyaBY6Qd 0nOmTOduWLo7kBeDnwjOQSyLNHJ/9U3d/Ez3PV1NFagGmreRjMXrXmfqWzJtjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759861025; 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=+FTI3megy0JunTZGY0xgsrEfdqHu3hlDp5cuirADp/s=; b=XmUEzJ0JACcQUc+ztTls/oadB70Mv8kf3CDlNnj2ZlwNRLwDEq72RGSnTlOO9CKXlNedbD EVTrIPaa8jCMaxhswiuBDDbcfcs0eB+S/TPrtPsCjAjvg4yMdosT8GooPLKHQwjzVwr7P7 hbUNmvS5chuw2ub6iIzQs2dPVX3xXrd+rdhN0QhDFgSHbdeAUGQ+0TzGJY5FMa5wNnh6+Q qifPw6juPbE3GZ8rwl1r9PWo6YYFkjHxE30ew5DRgKaU98ngvk2sa7HneoLDF4IdgdWp/G 344CXsa9EaHs7GrLfG910dOoscEhzuN/UblgRwPytOcHVfI7LGVAAPNaJ450qA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759861025; a=rsa-sha256; cv=none; b=oET0ZdD/nmB9j96kibVMxtSVgO0rOxp59G5zKluhT4AcBSZvoPF3pPQ0R2ZY2tAKcPt4r8 vJPXZnM8R/fc+UERukKw4pzEqyFCyOgNNI48Dv1boGasbPbWdRy46TRc1ga26KlxY6R2W+ YtPphvn7jrxQ0hffjIdmC3IIGxTagupxAVjuLzYM+HLK3T0wjnxPTPUXhSDHXHY0nkIZAD Kw9XRdnkCNVzEU5JbUxuKI4gBZwJjmKw0domesuHdnV64xDbXduyllLzeB0AzxtMv+z70t wLs7HdRZcQr5+jCxNpEZNZpqeLVoCNDsEzUBbTllUELQ0GKvFNJcVY/aP5LzNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ch49F3z7WzwJH; Tue, 07 Oct 2025 18:17:05 +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 597IH5Ke085164; Tue, 7 Oct 2025 18:17:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 597IH5ML085161; Tue, 7 Oct 2025 18:17:05 GMT (envelope-from git) Date: Tue, 7 Oct 2025 18:17:05 GMT Message-Id: <202510071817.597IH5ML085161@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 244ecc561601 - stable/13 - Makefile.inc1: Avoid including cwd in path 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 244ecc561601af61c9fca7240a1e5d990b6d3b5f Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=244ecc561601af61c9fca7240a1e5d990b6d3b5f commit 244ecc561601af61c9fca7240a1e5d990b6d3b5f Author: Ed Maste AuthorDate: 2024-08-16 16:18:15 +0000 Commit: Ed Maste CommitDate: 2025-10-07 18:16:44 +0000 Makefile.inc1: Avoid including cwd in path Buildworld failed when objcopy tried to overwrite itself, with `objcopy: open objcopy failed: Text file busy`. The PATH ended up with `::`, effectively including the current directory, and we found the wrong objcopy. PR: 261215 Sponsored by: The FreeBSD Foundation (cherry picked from commit ac7ed266dc73a1d55f2bc1e90bfce3c93757e8b4) (cherry picked from commit e425d433c5adaa0f7a513ba836fa378137ed7be4) --- Makefile.inc1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index eaa17139c3cf..3b954936be23 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -607,7 +607,10 @@ XPATH= ${WORLDTMP}/bin:${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin # When building we want to find the cross tools before the host tools in ${BPATH}. # We also need to add UNIVERSE_TOOLCHAIN_PATH so that we can find the shared # toolchain files (clang, lld, etc.) during make universe/tinderbox -STRICTTMPPATH= ${XPATH}:${BPATH}:${UNIVERSE_TOOLCHAIN_PATH} +STRICTTMPPATH= ${XPATH}:${BPATH} +.if defined(UNIVERSE_TOOLCHAIN_PATH) +STRICTTMPPATH:=${STRICTTMPPATH}:${UNIVERSE_TOOLCHAIN_PATH} +.endif # We should not be using tools from /usr/bin accidentally since this could cause # the build to break on other systems that don't have that tool. For now we # still allow using the old behaviour (inheriting $PATH) if