1 |
Fix _tc-getPROG function to account correctly for default values that |
2 |
contain program name along with arguments, e.g. the default for CPP |
3 |
containing "$(CC) -E". |
4 |
--- |
5 |
eclass/toolchain-funcs.eclass | 10 +++++----- |
6 |
1 file changed, 5 insertions(+), 5 deletions(-) |
7 |
|
8 |
diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass |
9 |
index e794559..8ecc736 100644 |
10 |
--- a/eclass/toolchain-funcs.eclass |
11 |
+++ b/eclass/toolchain-funcs.eclass |
12 |
@@ -22,7 +22,7 @@ inherit multilib |
13 |
_tc-getPROG() { |
14 |
local tuple=$1 |
15 |
local v var vars=$2 |
16 |
- local prog=$3 |
17 |
+ local prog=( $3 ) |
18 |
|
19 |
var=${vars%% *} |
20 |
for v in ${vars} ; do |
21 |
@@ -34,11 +34,11 @@ _tc-getPROG() { |
22 |
done |
23 |
|
24 |
local search= |
25 |
- [[ -n $4 ]] && search=$(type -p "$4-${prog}") |
26 |
- [[ -z ${search} && -n ${!tuple} ]] && search=$(type -p "${!tuple}-${prog}") |
27 |
- [[ -n ${search} ]] && prog=${search##*/} |
28 |
+ [[ -n $4 ]] && search=$(type -p $4-${prog[0]}) |
29 |
+ [[ -z ${search} && -n ${!tuple} ]] && search=$(type -p ${!tuple}-${prog[0]}) |
30 |
+ [[ -n ${search} ]] && prog[0]=${search##*/} |
31 |
|
32 |
- export ${var}=${prog} |
33 |
+ export ${var}="${prog[*]}" |
34 |
echo "${!var}" |
35 |
} |
36 |
tc-getBUILD_PROG() { _tc-getPROG CBUILD "BUILD_$1 $1_FOR_BUILD HOST$1" "${@:2}"; } |
37 |
-- |
38 |
2.9.0 |