diff options
Diffstat (limited to 'round-robin.sh')
| -rw-r--r-- | round-robin.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/round-robin.sh b/round-robin.sh index 48834ce8..94791172 100644 --- a/round-robin.sh +++ b/round-robin.sh @@ -357,9 +357,6 @@ build_abe () cd abe - local gnu_target - gnu_target=$(print_gnu_target ${rr[target]}) - # Remove previous build directories and .stamp files. # (we rely on ccache for fast rebuilds) # These stamp files tell ABE whether it needs to re-run @@ -390,7 +387,7 @@ build_abe () ccache -z local target_opt="" if [ x"${rr[target]}" != x"native" ]; then - target_opt="--target $gnu_target" + target_opt="--target $(print_gnu_target ${rr[target]})" # Disable TSan execution tests when using QEMU. # QEMU can't handle TSan's shadow memory and it sends host machine @@ -462,9 +459,10 @@ clean_sysroot () ( set -euf -o pipefail - local gnu_target sysroot + local gnu_host gnu_target sysroot + gnu_host=$(print_gnu_target native) gnu_target=$(print_gnu_target ${rr[target]}) - sysroot="$(pwd)/abe/builds/destdir/x86_64-pc-linux-gnu/$gnu_target/libc" + sysroot="$(pwd)/abe/builds/destdir/$gnu_host/$gnu_target/libc" rm -rf "$sysroot" ) @@ -517,7 +515,9 @@ EOF local binutils_incdir # Freshen up build and install directories. We rely on ccache for fast rebuilds. if $use_abe; then - rsync -a --del abe/builds/destdir/x86_64-pc-linux-gnu/ llvm-install/ + local gnu_host + gnu_host=$(print_gnu_target native) + rsync -a --del abe/builds/destdir/$gnu_host/ llvm-install/ binutils_incdir=$(pwd)/binutils/include else rm -rf llvm-install |