From nobody Wed Aug 27 21:34:32 2025 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 4cByV06gkHz65hyG; Wed, 27 Aug 2025 21:34:32 +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 4cByV04sq5z4P7j; Wed, 27 Aug 2025 21:34:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756330472; 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=DRPuDXkZf0dM7VtgkoaDIp+CzkuOp/3dwhErJWzFweE=; b=fVjVNLy08XpYvAQq/GcQmHXP4W91X7ABFjQnxYflRssxCTWGRmAgu41MczwqniMbB4adRf 5frarFoZjB6xWkLHg9tI4xfhleZlIFN3NaALhdKMEkBblA4W95FsjTy7P0zQo2+VzCAdRN 2y8mdrAcx//aYwzPVEjuCsn345Du1UoQq8Ns6qpnxJ3HKyuJEEmYQtjJCP3v34oowqZeCS 1/gRLGmoWuXZU+8/zDhP9Wjl0ulYBh/Qfi53pHXh5WMleiNwMI+RU6ditE4IvcaNt52s71 xLJysM9xVbIZdAFfmoOw9z80DKRv35qd0eUwdTlgLQQwdWNaoj3lrArWbLV9qQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756330472; 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=DRPuDXkZf0dM7VtgkoaDIp+CzkuOp/3dwhErJWzFweE=; b=f6wS1NeIBP5thA+J8d0MLzMTVEGEldzj+JDWAeBCP4UskHz7UMq5WWIlNzoGWBMTmWSGni 2PMYEgKGcZmOs5sAqA2V7GVUhvGUvOTr25G9q5uWEhNajhUa9vFa7KA5JjLllJSnzLkjLc 9TCEv+8GTaqFdUfFLQyPvtBf/He4o7ALLlYpMj3vNd3IVo4yFKtPdgZGfOTjd4s65/qfsc fh6NIQScms1lPavUh+E0avMuyAH1MPuGeZeNW629pc5NQUuvJ4b+34AMw5Na9HuD8tUUgf LOtZuqB8zQkBXH32BWhAsEnIspM1Pf4Xc6xubAlZ2JP4KsHRiEtaqUwnMIglWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756330472; a=rsa-sha256; cv=none; b=olvErWFg7MvbHACoKeq0hG4kS1UaAq3+eK5MDfa3I/B+OwqWYHc49MzhWryNYpvr4zGeWv nPJksnf7lE+rEZbUawejfo+LWg6eNQFd7nWlDWd8Ea+o1JNJVjdyWBX9Ewc7yhKhOUMtqP FSDKflsLMzLlZxCxa9ADezBQBlSWKQu3Xepa8O7khJ/W1gqGWus3cv/B6JVO3NN0GblTQ2 wQVKN86LBBow6vmKVzrrTSxiDDUdCocV2QsXzPN5JxmBrYxwvvsQHG2e6gDVWXpEfGBs/d 2zF9fXgGpTyMVBFo/ULwrPS7ymOmNG4LG3kyTumTfzO3rsjiTodJ6HHMhO7zag== 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 4cByV03ym7zfy0; Wed, 27 Aug 2025 21:34:32 +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 57RLYW24087970; Wed, 27 Aug 2025 21:34:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57RLYW3A087967; Wed, 27 Aug 2025 21:34:32 GMT (envelope-from git) Date: Wed, 27 Aug 2025 21:34:32 GMT Message-Id: <202508272134.57RLYW3A087967@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: ac7ed266dc73 - main - Makefile.inc1: Avoid including cwd in path 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ac7ed266dc73a1d55f2bc1e90bfce3c93757e8b4 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ac7ed266dc73a1d55f2bc1e90bfce3c93757e8b4 commit ac7ed266dc73a1d55f2bc1e90bfce3c93757e8b4 Author: Ed Maste AuthorDate: 2024-08-16 16:18:15 +0000 Commit: Ed Maste CommitDate: 2025-08-27 21:34:12 +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 --- Makefile.inc1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index c6cbc411be80..3bbc4afed3fd 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -644,7 +644,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