diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2016-06-22 21:48:40 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2016-06-26 17:34:47 +0200 |
| commit | 66d4ffc4ef0dfbf7cd135cd7c54d6623c130c9a4 (patch) | |
| tree | 4c38440af1a535d8b7cd471dacf4e89fb209dd97 /eclass/toolchain-funcs.eclass | |
| parent | app-office/libreoffice-l10n: Migrate from LINGUAS to L10N. (diff) | |
| download | gentoo-66d4ffc4ef0dfbf7cd135cd7c54d6623c130c9a4.tar.gz gentoo-66d4ffc4ef0dfbf7cd135cd7c54d6623c130c9a4.tar.bz2 gentoo-66d4ffc4ef0dfbf7cd135cd7c54d6623c130c9a4.zip | |
toolchain-funcs.eclass: Fix _tc-getPROG with multi-parameter defaults
Fix _tc-getPROG function to account correctly for default values that
contain program name along with arguments, e.g. the default for CPP
containing "$(CC) -E".
Diffstat (limited to 'eclass/toolchain-funcs.eclass')
| -rw-r--r-- | eclass/toolchain-funcs.eclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass index e794559bbcfb..8ecc73647a46 100644 --- a/eclass/toolchain-funcs.eclass +++ b/eclass/toolchain-funcs.eclass @@ -22,7 +22,7 @@ inherit multilib _tc-getPROG() { local tuple=$1 local v var vars=$2 - local prog=$3 + local prog=( $3 ) var=${vars%% *} for v in ${vars} ; do @@ -34,11 +34,11 @@ _tc-getPROG() { done local search= - [[ -n $4 ]] && search=$(type -p "$4-${prog}") - [[ -z ${search} && -n ${!tuple} ]] && search=$(type -p "${!tuple}-${prog}") - [[ -n ${search} ]] && prog=${search##*/} + [[ -n $4 ]] && search=$(type -p $4-${prog[0]}) + [[ -z ${search} && -n ${!tuple} ]] && search=$(type -p ${!tuple}-${prog[0]}) + [[ -n ${search} ]] && prog[0]=${search##*/} - export ${var}=${prog} + export ${var}="${prog[*]}" echo "${!var}" } tc-getBUILD_PROG() { _tc-getPROG CBUILD "BUILD_$1 $1_FOR_BUILD HOST$1" "${@:2}"; } |