summaryrefslogtreecommitdiff
path: root/Meta/build-image-qemu.sh
diff options
context:
space:
mode:
authorGunnar Beutner <gbeutner@serenityos.org>2021-07-03 10:38:56 +0200
committerAndreas Kling <kling@serenityos.org>2021-07-03 12:06:20 +0200
commit0ec1077bcb7a3fd3f96aaf540a085380608d52e4 (patch)
tree9be04bfa09fe000a8cf4824eec97b1458d9832a3 /Meta/build-image-qemu.sh
parent57340dda36bf1732d94c15ef1c07ecf777b8fc6b (diff)
downloadserenity-0ec1077bcb7a3fd3f96aaf540a085380608d52e4.zip
Meta: Prefer to use the QEMU binaries from the toolchain directory
Diffstat (limited to 'Meta/build-image-qemu.sh')
-rwxr-xr-xMeta/build-image-qemu.sh10
1 files changed, 10 insertions, 0 deletions
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