summaryrefslogtreecommitdiff
path: root/mk/bsd.pkg.mk
diff options
context:
space:
mode:
authorobache <obache>2012-07-18 12:29:12 +0000
committerobache <obache>2012-07-18 12:29:12 +0000
commit8f6bceabae408f39879bc8454f71b68ddd7ebbbb (patch)
treed5745519b042fe46263282679818ea7d38487d74 /mk/bsd.pkg.mk
parent9b5cd37466aedb42e8acd13afb849ae5fd32c360 (diff)
downloadpkgsrc-8f6bceabae408f39879bc8454f71b68ddd7ebbbb.tar.gz
Pass down ${_PATH_ORIG} to privileged stage sub make instead of modified ${PATH}
for pkgsrc internally, It may cause some problems (ex. unwanted pick up commands of tools/wrapper). No objection in teck-pkg@ for a week.
Diffstat (limited to 'mk/bsd.pkg.mk')
-rw-r--r--mk/bsd.pkg.mk6
1 files changed, 2 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index b349ce8cedf..15944e01deb 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1981 2012/05/24 11:34:15 abs Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1982 2012/07/18 12:29:12 obache Exp $
#
# This file is in the public domain.
#
@@ -601,11 +601,9 @@ ${.CURDIR}/${WRKDIR_BASENAME}:
# The additional flags that are passed to the make process.
#
-# XXX: Shouldn't the $${PATH} be ${PATH} here? This may be related to
-# PR 34470.
_ROOT_CMD= cd ${.CURDIR} && \
${PKGSRC_SETENV} ${PKGSRC_MAKE_ENV} \
- PATH="$${PATH}:"${SU_CMD_PATH_APPEND:Q} \
+ PATH=${_PATH_ORIG:Q}:${SU_CMD_PATH_APPEND:Q} \
${MAKE} ${MAKEFLAGS} _PKGSRC_BARRIER=yes \
PKG_DEBUG_LEVEL=${PKG_DEBUG_LEVEL:Q} \
su-${.TARGET} ${MAKEFLAGS.su-${.TARGET}}