diff options
Diffstat (limited to 'tcwg-benchmark.sh')
| -rwxr-xr-x | tcwg-benchmark.sh | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/tcwg-benchmark.sh b/tcwg-benchmark.sh index 1d8db998..1c0d5c69 100755 --- a/tcwg-benchmark.sh +++ b/tcwg-benchmark.sh @@ -196,26 +196,29 @@ case "$toolchain_type" in ;; esac -case "$toolchain_type" in - "gnu") ccname="gcc" ;; - "llvm") ccname="clang" ;; -esac -ccpath=$($maybe_remote find "$toolchaindir" -path "*bin/*$ccname") -if [ "$(echo "$ccpath" | wc -w)" -ne 1 ]; then - echo "ERROR: found more than one compiler: $ccpath" - exit 1 -fi - # Non-ssh:// cases have to copy the just-copied toolchain to # the remote build container. For ssh://, we'll access the # toolchain remotely. case "$toolchain_url" in "ssh://"*) ;; *) + case "$toolchain_type" in + "gnu") ccname="gcc" ;; + "llvm") ccname="clang" ;; + esac + + ccpath=$($maybe_remote find "$toolchaindir" -path "*bin/*$ccname") + if [ "$(echo "$ccpath" | wc -w)" -ne 1 ]; then + echo "ERROR: found more than one compiler: $ccpath" + exit 1 + fi + ccprefix=$(echo "$ccpath" | sed -e "s/$ccname\$//") # Copy toolchain to the build container. rsync -a --delete -e "ssh -p$build_container_port" "$toolchaindir/" "$build_container_host:$toolchaindir/" - ccprefix="$build_container_host:$build_container_port:$ccprefix" + if [ x"$builder" != x"bmk_board" ]; then + ccprefix="$build_container_host:$build_container_port:$ccprefix" + fi ;; esac |