Selaa lähdekoodia

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.
Gunnar Beutner 4 vuotta sitten
vanhempi
commit
45f2e9f3cf
1 muutettua tiedostoa jossa 1 lisäystä ja 4 poistoa
  1. 1 4
      Meta/run.sh

+ 1 - 4
Meta/run.sh

@@ -55,12 +55,9 @@ if [ -z "$SERENITY_QEMU_BIN" ]; then
             QEMU_BINARY_SUFFIX=".exe"
             QEMU_BINARY_SUFFIX=".exe"
         fi
         fi
     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}"
         SERENITY_QEMU_BIN="${QEMU_BINARY_PREFIX}qemu-system-x86_64${QEMU_BINARY_SUFFIX}"
     else
     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}"
         SERENITY_QEMU_BIN="${QEMU_BINARY_PREFIX}qemu-system-i386${QEMU_BINARY_SUFFIX}"
     fi
     fi
 fi
 fi