From nobody Wed Sep 3 13:28:29 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 4cH3Mx5R7cz66QGd; Wed, 03 Sep 2025 13:28:29 +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 4cH3Mx47y3z3gsw; Wed, 03 Sep 2025 13:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756906109; 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=3BZ8VWsY3wrw4yyoMjylV20RyRLzEPtYhCzQsska1mI=; b=eBOeJAlnWOH7FZkJ2mIzyuAwJqDhjIqAwyQwCsFug/IVSc7aUoGVpVmjfoCJwyfM0ILe8q kOhYJ5wxx/i4ykZgk/zCFNPgponz2VFMerhImE4164B5SiQYilByf44A9FZ4Iws429JJn6 PTcUCzTIsCCz5eVyurro+BxxGL2BFgSoR3DJt3m7uacll811Vh4PyjZJg5WbDZGQxMx9l1 23ZNXPBESbF2MKMoJBkNMCMY91FVEfIOvWLaoRYDvvbXcm+V7ns39FzLTsSCthNiH3cYGb cbwPtW7DRrkQUB4c8H9OsXJ8aIe0ptkOq4wKZFzx7H9KGy2Ysnsrp5QXWu9KWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756906109; 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=3BZ8VWsY3wrw4yyoMjylV20RyRLzEPtYhCzQsska1mI=; b=Wy8nwZ9WKAVk0Eo01/I8/U1BiSIkQz6wBmWZ87UQ7ovCqbT+ppvlbp21MiLNd0waK+I2yB lKg8DZwWX4S+sb7K6RvRHYEi8ZNT/DbJvKR/1dr8SOV3fbORZUl70qZYF+cd5vudG5Ok/U I4h/fEIUl3gA3KKmYkGUJHDrIl2iJRFydRxInqYQuxfes1OEztF2zkjmT7pJKOTxe92MTY 8VPhLYJ3cB/W+cDO0iDMH9HKV4GRQBOHrPypwNFx4jcT/GqB7Za8snHBHV3/uM5b9go4nA xdBg0Yaa/k7OXwAeUrxpi7CcPfC1sURfd639KA0ls+E3MQAMpxPmMQmr2cx0rA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756906109; a=rsa-sha256; cv=none; b=Lk68sUeSKWRgBuZlKrSQDZ3E8UHTtzYRBIwTXhOA+k64FhMecUtOwZppxIOkvZ9K535IJG kdnFkRbWryj5eNWZfQ0K4UnYKpN9VCQtL4b67jzYiljuqllU3OoAUYeyj/pfEz/uHQfHS2 9TA9dZthcF9ZUpqiRwYQnumUSOqqDyAR8jpXkVURWA7OJoVRs6ZOtJSfMjRD1Jxe5kaBWV tC+sTd2E95mjtfxVYF6o/eEXyprZlfJ4IMqxOqy6vVUxmf06eY0Fw5CLV4cLXQrcej8uBl ZfvtEWkxstADTn61x2AmX64N8OGK3SB7Ae6D1tgBoe0cXITDB7i9YROzr/xxGg== 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 4cH3Mx3dHjz3Py; Wed, 03 Sep 2025 13:28:29 +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 583DSTpE075938; Wed, 3 Sep 2025 13:28:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 583DSTBR075935; Wed, 3 Sep 2025 13:28:29 GMT (envelope-from git) Date: Wed, 3 Sep 2025 13:28:29 GMT Message-Id: <202509031328.583DSTBR075935@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: e425d433c5ad - stable/14 - Makefile.inc1: Avoid including cwd in path 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e425d433c5adaa0f7a513ba836fa378137ed7be4 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e425d433c5adaa0f7a513ba836fa378137ed7be4 commit e425d433c5adaa0f7a513ba836fa378137ed7be4 Author: Ed Maste AuthorDate: 2024-08-16 16:18:15 +0000 Commit: Ed Maste CommitDate: 2025-09-03 13:28:15 +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) --- Makefile.inc1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index cbc2a226e83b..57306e3b65e7 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -615,7 +615,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