From 5994b77e7669ab8643fadd61e8a31080b80d2bf2 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Wed, 4 Sep 2019 08:45:52 +0200 Subject: 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 --- bin/ptxdist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin/ptxdist') 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[@]}") -- cgit v1.2.3