From 0ec1077bcb7a3fd3f96aaf540a085380608d52e4 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gbeutner@serenityos.org>
Date: Sat, 3 Jul 2021 10:38:56 +0200
Subject: [PATCH] Meta: Prefer to use the QEMU binaries from the toolchain
 directory

---
 Meta/build-image-qemu.sh | 10 ++++++++++
 Meta/run.sh              | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/Meta/build-image-qemu.sh b/Meta/build-image-qemu.sh
index a583bab7e9..6274c9d093 100755
--- a/Meta/build-image-qemu.sh
+++ b/Meta/build-image-qemu.sh
@@ -18,6 +18,16 @@ if [ "$(uname -s)" = "Darwin" ]; then
     export PATH="/usr/local/opt/e2fsprogs/sbin:$PATH"
 fi
 
+SCRIPT_DIR="$(dirname "${0}")"
+
+# Prepend the toolchain qemu directory so we pick up QEMU from there
+PATH="$SCRIPT_DIR/../Toolchain/Local/qemu/bin:$PATH"
+
+# Also prepend the i686 toolchain directory because that's where most
+# people will have their QEMU binaries if they built them before the
+# directory was changed to Toolchain/Local/qemu.
+PATH="$SCRIPT_DIR/../Toolchain/Local/i686/bin:$PATH"
+
 disk_usage() {
     # shellcheck disable=SC2003
 if [ "$(uname -s)" = "Darwin" ]; then
diff --git a/Meta/run.sh b/Meta/run.sh
index c9fe2a973d..b236ca9c40 100755
--- a/Meta/run.sh
+++ b/Meta/run.sh
@@ -25,6 +25,16 @@ if [ "$(uname)" = "Darwin" ] && [ "$(uname -m)" = "x86_64" ]; then
     fi
 fi
 
+SCRIPT_DIR="$(dirname "${0}")"
+
+# Prepend the toolchain qemu directory so we pick up QEMU from there
+PATH="$SCRIPT_DIR/../Toolchain/Local/qemu/bin:$PATH"
+
+# Also prepend the i686 toolchain directory because that's where most
+# people will have their QEMU binaries if they built them before the
+# directory was changed to Toolchain/Local/qemu.
+PATH="$SCRIPT_DIR/../Toolchain/Local/i686/bin:$PATH"
+
 SERENITY_RUN="${SERENITY_RUN:-$1}"
 
 if [ -z "$SERENITY_QEMU_BIN" ]; then