summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2013-05-06 09:37:57 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2013-05-06 10:48:31 +0200
commit986be20d4dd92b5c56d3395ac7657b45f360ba5a (patch)
treef212b38e9cd69234b2422b69eeffeccade830e86
parente609e8daa70f5a169435ed04ccb3126b054c1e3f (diff)
downloadptxdist-986be20d4dd92b5c56d3395ac7657b45f360ba5a.tar.gz
ptxdist-986be20d4dd92b5c56d3395ac7657b45f360ba5a.tar.xz
wrapper: remove wrapper dir from PATH before executing the real tool
This avoid recursions in case the 'real' tool is also a script that uses PATH to find the tool to execute. This fixes Problems on Fedora where ccache wrappers are in $PATH by default. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--scripts/wrapper/libwrapper.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/wrapper/libwrapper.sh b/scripts/wrapper/libwrapper.sh
index 00649b77a..2909cade1 100644
--- a/scripts/wrapper/libwrapper.sh
+++ b/scripts/wrapper/libwrapper.sh
@@ -21,6 +21,7 @@ fi
. ${PTXDIST_PLATFORMCONFIG}
wrapper_exec() {
+ PATH="$(echo "${PATH}" | sed "s;${PTXDIST_PATH_SYSROOT_HOST}/lib/wrapper:;;")"
if [ "${PTXDIST_VERBOSE}" = 1 -a -n "${PTXDIST_FD_LOGFILE}" ]; then
echo "wrapper: ${PTXDIST_CCACHE} ${0##*/} ${ARG_LIST} $* ${LATE_ARG_LIST}" >&${PTXDIST_FD_LOGFILE}
fi