mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-12-07 02:11:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1218 from marineam/config-wrapper

Browse Source 
scripts: do not include board binaries in $PATH
This commit is contained in:
Michael Marineau 2015-04-24 18:04:29 -07:00
commit 47cd160e0e
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdk_container/src/third_party/coreos-overlay/coreos/scripts/config_wrapper vendored
View File

@ -40,11 +40,9 @@ if [[ -z ${CHOST} ]] || [[ -z ${SYSROOT} ]] ; then
exit 1 exit 1
fi fi
PATH="${SYSROOT}/usr/bin:${PATH}"
# Some wrappers will dynamically figure out where they're being run from, # Some wrappers will dynamically figure out where they're being run from,
# and then output a full path -I/-L path based on that. So we trim any # and then output a full path -I/-L path based on that. So we trim any
# expanded sysroot paths that might be in the output already to avoid # expanded sysroot paths that might be in the output already to avoid
# having it be -L${SYSROOT}${SYSROOT}/usr/lib. # having it be -L${SYSROOT}${SYSROOT}/usr/lib.
set -o pipefail set -o pipefail
exec ${cfg} "$@" | sed -r "s:(-[IL])(${SYSROOT})?:\1${SYSROOT}:g" exec ${SYSROOT}/usr/bin/${cfg} "$@" | sed -r "s:(-[IL])(${SYSROOT})?:\1${SYSROOT}:g"