summaryrefslogtreecommitdiff
path: root/tcwg_kernel-build.sh
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2021-08-08 15:03:25 +0000
committerMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2021-08-08 15:58:46 +0000
commit445697fd48a2e12d5d2c891ee2e863b6658a6eeb (patch)
treefbc5cf2446e8df194217a60f214db7132fd9d12d /tcwg_kernel-build.sh
parent6deec513842ada3fdd5e5a544e1535cd5a05abf4 (diff)
downloadjenkins-scripts-445697fd48a2e12d5d2c891ee2e863b6658a6eeb.tar.gz
jenkins-helpers.sh: Fix and improve uses of print_gnu_target
Change-Id: I80bbc452bf0c10d25220dffe5e03252d06d4c668
Diffstat (limited to 'tcwg_kernel-build.sh')
-rwxr-xr-xtcwg_kernel-build.sh10
1 files changed, 6 insertions, 4 deletions
diff --git a/tcwg_kernel-build.sh b/tcwg_kernel-build.sh
index bb923767..1b0010da 100755
--- a/tcwg_kernel-build.sh
+++ b/tcwg_kernel-build.sh
@@ -106,9 +106,10 @@ build_linux_1 ()
rm -rf "$(pwd)"/bin
mkdir "$(pwd)"/bin
- local abe_bin cc ld_opt=""
+ local gnu_host abe_bin cc ld_opt=""
- abe_bin="$(pwd)/abe/builds/destdir/x86_64-pc-linux-gnu/bin"
+ gnu_host=$(print_gnu_target native)
+ abe_bin="$(pwd)/abe/builds/destdir/$gnu_host/bin"
# Use binutils $abe_bin for both GNU and LLVM builds.
# For LLVM builds at the very least we need target assembler, since,
# otherwise, clang will try to use /usr/bin/as for cases that integrated
@@ -213,8 +214,9 @@ boot_linux ()
*) assert false ;;
esac
- local qemu
- qemu="$(pwd)/abe/builds/hosttools/x86_64-pc-linux-gnu/bin/qemu-system-${rr[target]}"
+ local gnu_host qemu
+ gnu_host=$(print_gnu_target native)
+ qemu="$(pwd)/abe/builds/hosttools/$gnu_host/bin/qemu-system-${rr[target]}"
timeout --foreground 60s "$qemu" \
-kernel $image -machine virt $cpu -m 512 \