From 49b6732343ecb349534142b693d12becfc1b19e8 Mon Sep 17 00:00:00 2001
From: Alex Kotov <kotovalexarian@gmail.com>
Date: Mon, 17 Jan 2022 22:55:52 +0500
Subject: [PATCH] Fix cross-compiler build

---
 vendor/cross/build/i386/build.sh    | 14 +++++++-------
 vendor/cross/build/riscv64/build.sh | 14 +++++++-------
 vendor/cross/build/x86_64/build.sh  | 14 +++++++-------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/vendor/cross/build/i386/build.sh b/vendor/cross/build/i386/build.sh
index c023c6c..fc7bd61 100755
--- a/vendor/cross/build/i386/build.sh
+++ b/vendor/cross/build/i386/build.sh
@@ -2,20 +2,20 @@
 
 set -e
 
+REPO="$(realpath "$(dirname "$(realpath "$0")")/../..")"
+
 ARCH='i386'
 TARGET="$ARCH-elf"
-REPO="$(pwd)"
-PREFIX="$REPO/vendor/cross"
-PATH="$PREFIX/bin:$PATH"
+PATH="$REPO/bin:$PATH"
 
 if [ -z "$J" ]; then J='1'; fi
 
-cd "$REPO/vendor/cross/build/$ARCH/binutils"
-../../../../binutils-2.37/configure --target="$TARGET" --prefix="$PREFIX" --with-sysroot --disable-nls --disable-werror
+cd "$REPO/build/$ARCH/binutils"
+"$REPO/src/binutils-2.37/configure" --target="$TARGET" --prefix="$REPO" --with-sysroot --disable-nls --disable-werror
 make -j"$J"
 make install
 
-cd "$REPO/vendor/cross/build/$ARCH/gcc"
-../../../../gcc-11.2.0/configure --target="$TARGET" --prefix="$PREFIX" --disable-nls --enable-languages=c,c++ --without-headers
+cd "$REPO/build/$ARCH/gcc"
+"$REPO/src/gcc-11.2.0/configure" --target="$TARGET" --prefix="$REPO" --disable-nls --enable-languages=c,c++ --without-headers
 make -j"$J" all-gcc all-target-libgcc
 make install-gcc install-target-libgcc
diff --git a/vendor/cross/build/riscv64/build.sh b/vendor/cross/build/riscv64/build.sh
index 3598fc1..2bf7773 100755
--- a/vendor/cross/build/riscv64/build.sh
+++ b/vendor/cross/build/riscv64/build.sh
@@ -2,20 +2,20 @@
 
 set -e
 
+REPO="$(realpath "$(dirname "$(realpath "$0")")/../..")"
+
 ARCH='riscv64'
 TARGET="$ARCH-elf"
-REPO="$(pwd)"
-PREFIX="$REPO/vendor/cross"
-PATH="$PREFIX/bin:$PATH"
+PATH="$REPO/bin:$PATH"
 
 if [ -z "$J" ]; then J='1'; fi
 
-cd "$REPO/vendor/cross/build/$ARCH/binutils"
-../../../../binutils-2.37/configure --target="$TARGET" --prefix="$PREFIX" --with-sysroot --disable-nls --disable-werror
+cd "$REPO/build/$ARCH/binutils"
+"$REPO/src/binutils-2.37/configure" --target="$TARGET" --prefix="$REPO" --with-sysroot --disable-nls --disable-werror
 make -j"$J"
 make install
 
-cd "$REPO/vendor/cross/build/$ARCH/gcc"
-../../../../gcc-11.2.0/configure --target="$TARGET" --prefix="$PREFIX" --disable-nls --enable-languages=c,c++ --without-headers
+cd "$REPO/build/$ARCH/gcc"
+"$REPO/src/gcc-11.2.0/configure" --target="$TARGET" --prefix="$REPO" --disable-nls --enable-languages=c,c++ --without-headers
 make -j"$J" all-gcc all-target-libgcc
 make install-gcc install-target-libgcc
diff --git a/vendor/cross/build/x86_64/build.sh b/vendor/cross/build/x86_64/build.sh
index 2ad96ff..4e81645 100755
--- a/vendor/cross/build/x86_64/build.sh
+++ b/vendor/cross/build/x86_64/build.sh
@@ -2,20 +2,20 @@
 
 set -e
 
+REPO="$(realpath "$(dirname "$(realpath "$0")")/../..")"
+
 ARCH='x86_64'
 TARGET="$ARCH-elf"
-REPO="$(pwd)"
-PREFIX="$REPO/vendor/cross"
-PATH="$PREFIX/bin:$PATH"
+PATH="$REPO/bin:$PATH"
 
 if [ -z "$J" ]; then J='1'; fi
 
-cd "$REPO/vendor/cross/build/$ARCH/binutils"
-../../../../binutils-2.37/configure --target="$TARGET" --prefix="$PREFIX" --with-sysroot --disable-nls --disable-werror
+cd "$REPO/build/$ARCH/binutils"
+"$REPO/binutils-2.37/configure" --target="$TARGET" --prefix="$REPO" --with-sysroot --disable-nls --disable-werror
 make -j"$J"
 make install
 
-cd "$REPO/vendor/cross/build/$ARCH/gcc"
-../../../../gcc-11.2.0/configure --target="$TARGET" --prefix="$PREFIX" --disable-nls --enable-languages=c,c++ --without-headers
+cd "$REPO/build/$ARCH/gcc"
+"$REPO/gcc-11.2.0/configure" --target="$TARGET" --prefix="$REPO" --disable-nls --enable-languages=c,c++ --without-headers
 make -j"$J" all-gcc all-target-libgcc
 make install-gcc install-target-libgcc