From 128e504de6c2c0d4ca186c1a6b7a0b8a59bb505b Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gbeutner@serenityos.org>
Date: Sat, 3 Jul 2021 10:43:13 +0200
Subject: [PATCH] Meta: Change the QEMU binary directory to
 Toolchain/Local/qemu

Previously we'd place the QEMU binaries into the architecture-specific
toolchain directory. This is a problem because the BuildIt.sh script
clears those directories which also removes the QEMU binaries users
may have built earlier. Also, the QEMU binaries are not specific to
the target architecture.
---
 Toolchain/BuildQemu.sh | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/Toolchain/BuildQemu.sh b/Toolchain/BuildQemu.sh
index f6feb23f7d..5384292821 100755
--- a/Toolchain/BuildQemu.sh
+++ b/Toolchain/BuildQemu.sh
@@ -7,8 +7,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 echo "$DIR"
 
-ARCH=${ARCH:-"i686"}
-PREFIX="$DIR/Local/$ARCH"
+PREFIX="$DIR/Local/qemu"
 BUILD=$(realpath "$DIR/../Build")
 SYSROOT="$BUILD/Root"
 
@@ -46,7 +45,7 @@ pushd "$DIR/Tarballs"
 popd
 
 mkdir -p "$PREFIX"
-mkdir -p "$DIR/Build/$ARCH/qemu"
+mkdir -p "$DIR/Build/qemu"
 
 if [ -z "$MAKEJOBS" ]; then
     MAKEJOBS=$(nproc)
@@ -61,12 +60,10 @@ fi
 
 echo Using $UI_LIB based UI
 
-pushd "$DIR/Build/$ARCH"
-    pushd qemu
-        "$DIR"/Tarballs/$QEMU_VERSION/configure --prefix="$PREFIX" \
-                                                --target-list=i386-softmmu,x86_64-softmmu \
-                                                --enable-$UI_LIB || exit 1
-        make -j "$MAKEJOBS" || exit 1
-        make install || exit 1
-    popd
+pushd "$DIR/Build/qemu"
+    "$DIR"/Tarballs/$QEMU_VERSION/configure --prefix="$PREFIX" \
+                                            --target-list=i386-softmmu,x86_64-softmmu \
+                                            --enable-$UI_LIB || exit 1
+    make -j "$MAKEJOBS" || exit 1
+    make install || exit 1
 popd