Add /usr/pkg/bin to a few paths in our building infrastructure.

This allows the clang static analyzer to find perl and python when run
in conjunction with one of our build* targets.

diff --git a/Makefile b/Makefile
index cb288c9..86e8877 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -95,7 +95,7 @@ BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/}
 .ORDER: quickkernel installkernel
 .ORDER: quickkernel reinstallkernel
 
-PATH=  /sbin:/bin:/usr/sbin:/usr/bin
+PATH=  /sbin:/bin:/usr/sbin:/usr/bin:/usr/pkg/bin
 MAKE=  PATH=${PATH} make -m ${.CURDIR}/share/mk -f Makefile.inc1
 
 #

diff --git a/Makefile.inc1 b/Makefile.inc1
index 5bf441a..e7e31c5 100644 (file)
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -206,7 +206,7 @@ BTOOLSPATH= ${BTOOLSDEST}/usr/sbin:${BTOOLSDEST}/usr/bin:${BTOOLSDEST}/bin:${BTO
 # The strict temporary command path contains all binaries required
 # by the buildworld system after the cross-tools stage.
 #
-STRICTTMPPATH= ${CTOOLSDEST}/usr/sbin:${CTOOLSDEST}/usr/bin:${CTOOLSDEST}/bin:${CTOOLSDEST}/usr/games:${BTOOLSDEST}/usr/sbin:${BTOOLSDEST}/usr/bin:${BTOOLSDEST}/bin:${BTOOLSDEST}/usr/games
+STRICTTMPPATH= ${CTOOLSDEST}/usr/sbin:${CTOOLSDEST}/usr/bin:${CTOOLSDEST}/bin:${CTOOLSDEST}/usr/games:${BTOOLSDEST}/usr/sbin:${BTOOLSDEST}/usr/bin:${BTOOLSDEST}/bin:${BTOOLSDEST}/usr/games:/usr/pkg/bin
 
 TMPDIR?=       /tmp
 TMPPID!=       echo $$$$

diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index ba3b2b8..de8e98b 100644 (file)
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -47,7 +47,7 @@ CC_LINK               ?=      ${CC}
 # The system cc frontend is not subject to the path, e.g. when buildworld
 # is doing cross compiles it may still need the native compiler for things.
 #
-NXENV          ?=      CCVER=${HOST_CCVER} BINUTILSVER=${HOST_BINUTILSVER} OBJFORMAT_PATH=/ PATH=/usr/bin:/bin:/usr/sbin:/sbin
+NXENV          ?=      CCVER=${HOST_CCVER} BINUTILSVER=${HOST_BINUTILSVER} OBJFORMAT_PATH=/ PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/pkg/bin
 NXCC           ?=      ${NXENV} ${CC}
 NXCC_LINK      ?=      ${NXENV} ${CC_LINK}
 CFLAGS         ?=      -O -pipe