Skip to content

Commit ea2e22e

Browse files
committed
CI: Use QEMU 9.2.2 from ring-toolchain.
1 parent 52b239c commit ea2e22e

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

mk/cargo.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ qemu_riscv64="qemu-riscv64 -L /usr/riscv64-linux-gnu"
3333
qemu_s390x="qemu-s390x -L /usr/s390x-linux-gnu"
3434
qemu_sparc64="qemu-sparc64 -L /usr/sparc64-linux-gnu"
3535
qemu_x86="qemu-i386"
36-
qemu_x86_64="qemu-x86_64"
36+
qemu_x86_64="$PWD/target/tools/linux-x86_64/qemu/bin/qemu-x86_64"
3737

3838
# Avoid putting the Android tools in `$PATH` because there are tools in this
3939
# directory like `clang` that would conflict with the same-named tools that may

mk/install-build-tools.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,11 @@ wasm32-wasi|wasm32-wasip1|wasm32-wasip2)
203203
;;
204204
x86_64-unknown-linux-gnu)
205205
if [ -n "${RING_CPU_MODEL-}" ]; then
206-
install_packages qemu-user
206+
git clone \
207+
--branch linux-x86_64 \
208+
--depth 1 \
209+
https://github.com/briansmith/ring-toolchain \
210+
target/tools/linux-x86_64
207211
fi
208212
;;
209213
*)

0 commit comments

Comments
 (0)