From 45f2e9f3cffd6c4bfedb719d2a11f01fbdf43067 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar@beutner.name>
Date: Sun, 8 Aug 2021 01:31:32 +0200
Subject: Meta: Don't use x86_64 QEMU for the i686 kernel

This seemed like a good idea at the time to avoid an unnecessary
dependency on qemu-system-i386. However this makes debugging the
kernel with GDB more difficult because GDB assumes that the QEMU
architectures matches the kernel architecture.
---
 Meta/run.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'Meta/run.sh')

diff --git a/Meta/run.sh b/Meta/run.sh
index 0d8175797c..62762002e7 100755
--- a/Meta/run.sh
+++ b/Meta/run.sh
@@ -55,12 +55,9 @@ if [ -z "$SERENITY_QEMU_BIN" ]; then
             QEMU_BINARY_SUFFIX=".exe"
         fi
     fi
-    if command -v "${QEMU_BINARY_PREFIX}qemu-system-x86_64${QEMU_BINARY_SUFFIX}" >/dev/null; then
+    if [ "$SERENITY_ARCH" = "x86_64" ]; then
         SERENITY_QEMU_BIN="${QEMU_BINARY_PREFIX}qemu-system-x86_64${QEMU_BINARY_SUFFIX}"
     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_BINARY_PREFIX}qemu-system-i386${QEMU_BINARY_SUFFIX}"
     fi
 fi
-- 
cgit v1.2.3