diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-06-06 22:01:10 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-06-06 22:35:02 +0200 |
| commit | b23f7e2b1de32a6038ebaa13a3a9f93f6cfeb74b (patch) | |
| tree | b6ff6c27af28c1ed15bf9d3bf21c279ca2fe47b8 /scripts | |
| parent | dd2fc708a991f1f486c7e1db89524bc0c698326a (diff) | |
| download | ptxdist-b23f7e2b1de32a6038ebaa13a3a9f93f6cfeb74b.tar.gz ptxdist-b23f7e2b1de32a6038ebaa13a3a9f93f6cfeb74b.tar.xz | |
wrapper: some cleanup
Add variables for the filename and full path of the command that will be
executed.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/wrapper/libwrapper.sh | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/scripts/wrapper/libwrapper.sh b/scripts/wrapper/libwrapper.sh index 00216f615..51d6ff818 100644 --- a/scripts/wrapper/libwrapper.sh +++ b/scripts/wrapper/libwrapper.sh @@ -21,15 +21,18 @@ fi . ${PTXDIST_PLATFORMCONFIG} +CMD="${0##*/}" +FULL_CMD="${0%/*}/real/${CMD}" + 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_ICECC}${PTXDIST_CCACHE} ${0##*/} ${ARG_LIST} $* ${LATE_ARG_LIST}" >&${PTXDIST_FD_LOGFILE} + echo "wrapper: ${PTXDIST_ICECC}${PTXDIST_CCACHE} ${CMD} ${ARG_LIST} $* ${LATE_ARG_LIST}" >&${PTXDIST_FD_LOGFILE} fi if [ -n "${FAKEROOTKEY}" -o -z "${ICECC_VERSION}" -o ! -e "${ICECC_VERSION}" ]; then unset PTXDIST_ICECC fi - exec ${PTXDIST_ICECC}${PTXDIST_CCACHE} "${0%/*}/real/${0##*/}" ${ARG_LIST} "$@" ${LATE_ARG_LIST} + exec ${PTXDIST_ICECC}${PTXDIST_CCACHE} "${FULL_CMD}" ${ARG_LIST} "$@" ${LATE_ARG_LIST} } cc_check_args() { @@ -67,7 +70,7 @@ cc_check_args() { -I/usr/include | -L/usr/lib | -L/lib) if ! ${HOST}; then echo "wrapper: Bad search path in:" >&2 - echo "${0##*/} $*" >&2 + echo "${CMD} $*" >&2 exit 1 fi ;; @@ -284,23 +287,23 @@ add_icecc_args() { cc_add_target_icecc() { add_icecc_args export ICECC_VERSION="${ICECC_VERSION_TARGET}" - export ICECC_CC="${0%/*}/real/${0##*/}" + export ICECC_CC="${FULL_CMD}" } cxx_add_target_icecc() { add_icecc_args export ICECC_VERSION="${ICECC_VERSION_TARGET}" - export ICECC_CXX="${0%/*}/real/${0##*/}" + export ICECC_CXX="${FULL_CMD}" } cc_add_host_icecc() { add_icecc_args export ICECC_VERSION="${ICECC_VERSION_HOST}" - export ICECC_CC="${0%/*}/real/${0##*/}" + export ICECC_CC="${FULL_CMD}" } cxx_add_host_icecc() { add_icecc_args export ICECC_VERSION="${ICECC_VERSION_HOST}" - export ICECC_CXX="${0%/*}/real/${0##*/}" + export ICECC_CXX="${FULL_CMD}" } |