git: ac7ed266dc73 - main - Makefile.inc1: Avoid including cwd in path

The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=ac7ed266dc73a1d55f2bc1e90bfce3c93757e8b4

commit ac7ed266dc73a1d55f2bc1e90bfce3c93757e8b4
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2024-08-16 16:18:15 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
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