diff options
| author | obache <obache@pkgsrc.org> | 2012-07-18 12:29:12 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2012-07-18 12:29:12 +0000 |
| commit | f35334778de6ab45ff39833bd855d9f306f74534 (patch) | |
| tree | d5745519b042fe46263282679818ea7d38487d74 /mk | |
| parent | 8392d7031cc354c40deeed047dbcd12be55b9c56 (diff) | |
| download | pkgsrc-f35334778de6ab45ff39833bd855d9f306f74534.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')
| -rw-r--r-- | mk/bsd.pkg.mk | 6 |
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}} |