From 31655c94868f1eaa5fad9357fa6cb6df819d5bc4 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Tue, 3 Aug 2021 14:53:29 +0200 Subject: [PATCH] Meta: Prefer to use the 64-bit QEMU binary if that's available Some users might not have qemu-system-i386 installed. --- Meta/run.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Meta/run.sh b/Meta/run.sh index 61929cb178..770f9fd645 100755 --- a/Meta/run.sh +++ b/Meta/run.sh @@ -38,9 +38,12 @@ PATH="$SCRIPT_DIR/../Toolchain/Local/i686/bin:$PATH" SERENITY_RUN="${SERENITY_RUN:-$1}" if [ -z "$SERENITY_QEMU_BIN" ]; then - if [ "$SERENITY_ARCH" = "x86_64" ]; then + if command -v qemu-system-x86_64 >/dev/null; then SERENITY_QEMU_BIN="qemu-system-x86_64" else + if [ "$SERENITY_ARCH" = "x86_64" ]; then + die "Please install the 64-bit QEMU system emulator (qemu-system-x86_64)." + fi SERENITY_QEMU_BIN="qemu-system-i386" fi fi