Meta: Run 64-bit kernels with qemu-system-x86_64

cubiclove · Jun 25, 2021 · 1979c7d · 1979c7d
1 parent 5eb6528
commit 1979c7d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -40,7 +40,7 @@ option(ENABLE_KERNEL_LTO "Build the kernel with link-time optimization" OFF)
 include(Meta/CMake/wasm_spec_tests.cmake)
 
 add_custom_target(run
- COMMAND ${CMAKE_SOURCE_DIR}/Meta/run.sh
+ COMMAND ${CMAKE_COMMAND} -E env "SERENITY_ARCH=${SERENITY_ARCH}" ${CMAKE_SOURCE_DIR}/Meta/run.sh
  USES_TERMINAL
 )
 

diff --git a/Meta/run.sh b/Meta/run.sh
@@ -27,7 +27,13 @@ fi
 
 SERENITY_RUN="${SERENITY_RUN:-$1}"
 
-[ -z "$SERENITY_QEMU_BIN" ] && SERENITY_QEMU_BIN="qemu-system-i386"
+if [ -z "$SERENITY_QEMU_BIN" ]; then
+ if [ "$SERENITY_ARCH" = "x86_64" ]; then
+ SERENITY_QEMU_BIN="qemu-system-x86_64"
+ else
+ SERENITY_QEMU_BIN="qemu-system-i386"
+ fi
+fi
 
 [ -z "$SERENITY_KERNEL_CMDLINE" ] && SERENITY_KERNEL_CMDLINE="hello"