From 809852aeb17fdf1c75e74d46ea5685cacf478126 Mon Sep 17 00:00:00 2001
From: Andrew Kaster <akaster@serenityos.org>
Date: Thu, 16 Jun 2022 02:32:26 -0600
Subject: [PATCH] Toolchain+Ports: Install host ruby into Local/ruby, not
 Local/$ARCH

Following the pattern for qemu, mold, and clang, we should install the
host ruby required to build the ruby port into its own install tree
rather than forcing it into the GNU compiler's bindir.
---
 Ports/ruby/package.sh  | 2 ++
 Toolchain/BuildRuby.sh | 9 ++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Ports/ruby/package.sh b/Ports/ruby/package.sh
index 33c3340154..8662622ee2 100755
--- a/Ports/ruby/package.sh
+++ b/Ports/ruby/package.sh
@@ -2,6 +2,8 @@
 
 source version.sh
 
+export PATH="${SERENITY_SOURCE_DIR}/Toolchain/Local/ruby/bin:${PATH}"
+
 port=ruby
 version=${RUBY_VERSION}
 useconfigure="true"
diff --git a/Toolchain/BuildRuby.sh b/Toolchain/BuildRuby.sh
index 8791285b93..ec970227e2 100755
--- a/Toolchain/BuildRuby.sh
+++ b/Toolchain/BuildRuby.sh
@@ -5,9 +5,8 @@ set -e
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-ARCH=${ARCH:-"i686"}
-PREFIX_DIR="$DIR/Local/$ARCH"
-BUILD_DIR="$DIR/Build/$ARCH"
+PREFIX_DIR="$DIR/Local/ruby"
+BUILD_DIR="$DIR/Build/ruby"
 TARBALLS_DIR="$DIR/Tarballs"
 
 # shellcheck source=/dev/null
@@ -42,9 +41,9 @@ if [ -z "$MAKEJOBS" ]; then
 fi
 
 mkdir -p "${PREFIX_DIR}"
-mkdir -p "${BUILD_DIR}/ruby"
+mkdir -p "${BUILD_DIR}"
 
-pushd "${BUILD_DIR}/ruby"
+pushd "${BUILD_DIR}"
     "${TARBALLS_DIR}"/ruby-"${RUBY_VERSION}"/configure --prefix="${PREFIX_DIR}"
     make -j "${MAKEJOBS}"
     make install