diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-09-04 08:45:52 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-09-04 08:45:54 +0200 |
| commit | 5994b77e7669ab8643fadd61e8a31080b80d2bf2 (patch) | |
| tree | 16bbd090852c61aaadc554551ca933f16081bcb9 /bin | |
| parent | 0ab8b75c3a1dad0d8516b053d6acb8b0f5c3a812 (diff) | |
| download | ptxdist-5994b77e7669ab8643fadd61e8a31080b80d2bf2.tar.gz ptxdist-5994b77e7669ab8643fadd61e8a31080b80d2bf2.tar.xz | |
ptxdist: try harder when looking for a toolchain
The next OSELAS.Toolchain may contain an extra component (for clang) in the
path. Add an extra '*' to the pattern to match those toolchains as well.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ptxdist | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/ptxdist b/bin/ptxdist index d4e51a7ef..cc3253db7 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -1657,11 +1657,11 @@ do_select_toolchain_guess() libc="" fi - local hint="/opt/${vendor}/${target}/${gcc}${java}${libc}*/bin" + local hint="/opt/${vendor}/${target}/${gcc}${java}*${libc}*/bin" # let the shell expand the "*" in the hint, put it into an array if ! ptxd_get_path ${hint}; then - hint="/opt/${vendor}*/${target}/${gcc}${java}${libc}*/bin" + hint="/opt/${vendor}*/${target}/${gcc}${java}*${libc}*/bin" ptxd_get_path ${hint} fi toolchain=("${ptxd_reply[@]}") |