diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2021-01-04 08:59:01 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2021-01-04 08:59:01 +0000 |
| commit | ee029ab5ad04594ecaf1aaccaa7ddcee7ace31e0 (patch) | |
| tree | eb9ff39994d987488d11774c0b7fdf5d3a4b402c | |
| parent | 6374b03133449ad31e9285ffd3bb78acca1efee9 (diff) | |
Update expected x86_64 host tuple for ABE builds
... from x86_64-unknown-linux-gnu to x86_64-pc-linux-gnu after updating
config.guess in ABE.
Change-Id: I81333036fb8d183ad81e3fa5b5836645e8b6220f
| -rw-r--r-- | round-robin.sh | 2 | ||||
| -rwxr-xr-x | tcwg_bmk-build.sh | 2 | ||||
| -rwxr-xr-x | tcwg_kernel-build.sh | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/round-robin.sh b/round-robin.sh index a6725bc2..ee18731d 100644 --- a/round-robin.sh +++ b/round-robin.sh @@ -463,7 +463,7 @@ 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-unknown-linux-gnu/ llvm-install/ + rsync -a --del abe/builds/destdir/x86_64-pc-linux-gnu/ llvm-install/ binutils_incdir=$(pwd)/binutils/include else rm -rf llvm-install diff --git a/tcwg_bmk-build.sh b/tcwg_bmk-build.sh index 516e26e2..2e3fdffe 100755 --- a/tcwg_bmk-build.sh +++ b/tcwg_bmk-build.sh @@ -205,7 +205,7 @@ benchmark () ;; gnu|gnu_eabi) bmk_ldflags="$bmk_flags" - bin="$(pwd)/abe/builds/destdir/x86_64-unknown-linux-gnu/bin" + bin="$(pwd)/abe/builds/destdir/x86_64-pc-linux-gnu/bin" cc="$bin/$gnu_target-" ;; esac diff --git a/tcwg_kernel-build.sh b/tcwg_kernel-build.sh index f3fb18c4..ca0fc01d 100755 --- a/tcwg_kernel-build.sh +++ b/tcwg_kernel-build.sh @@ -124,7 +124,7 @@ build_linux_1 () esac ;; gnu) - bin="$(pwd)/abe/builds/destdir/x86_64-unknown-linux-gnu/bin" + bin="$(pwd)/abe/builds/destdir/x86_64-pc-linux-gnu/bin" cc="$bin/$(print_gnu_target ${rr[target]})-gcc" ;; esac @@ -216,7 +216,7 @@ boot_linux () esac local qemu - qemu="$(pwd)/abe/builds/hosttools/x86_64-unknown-linux-gnu/bin/qemu-system-${rr[target]}" + qemu="$(pwd)/abe/builds/hosttools/x86_64-pc-linux-gnu/bin/qemu-system-${rr[target]}" timeout --foreground 60s "$qemu" \ -kernel $image -machine virt $cpu -m 512 \ |