From 11174bfa14b756efb756eb212eeb7bac6a8904bd Mon Sep 17 00:00:00 2001
From: Bananymous <oskari.alaranta@bananymous.com>
Date: Tue, 3 Jun 2025 23:02:10 +0300
Subject: [PATCH] BuildSystem: Rename toolchain -> x86_64-pc-banan_os

---
 script/config.sh           | 22 +++++++++++-----------
 toolchain/Toolchain.txt    |  4 ++--
 toolchain/build.sh         |  3 ++-
 toolchain/gcc-12.2.0.patch |  4 ++--
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/script/config.sh b/script/config.sh
index 7502c72238..5193dd69d9 100644
--- a/script/config.sh
+++ b/script/config.sh
@@ -8,28 +8,28 @@ if [[ -z $BANAN_ROOT_DIR ]]; then
 fi
 
 if [[ -z $BANAN_ARCH ]]; then
-	export BANAN_ARCH=x86_64
+	export BANAN_ARCH='x86_64'
 fi
 
-export BANAN_TOOLCHAIN_DIR=$BANAN_ROOT_DIR/toolchain
-export BANAN_TOOLCHAIN_PREFIX=$BANAN_TOOLCHAIN_DIR/local
-export BANAN_TOOLCHAIN_TRIPLE=$BANAN_ARCH-banan_os
+export BANAN_TOOLCHAIN_DIR="$BANAN_ROOT_DIR/toolchain"
+export BANAN_TOOLCHAIN_PREFIX="$BANAN_TOOLCHAIN_DIR/local"
+export BANAN_TOOLCHAIN_TRIPLE="$BANAN_ARCH-pc-banan_os"
 
-export BANAN_BUILD_DIR=$BANAN_ROOT_DIR/build
+export BANAN_BUILD_DIR="$BANAN_ROOT_DIR/build"
 
-export BANAN_PORT_DIR=$BANAN_ROOT_DIR/ports
+export BANAN_PORT_DIR="$BANAN_ROOT_DIR/ports"
 
-export BANAN_SYSROOT=$BANAN_BUILD_DIR/sysroot
-export BANAN_SYSROOT_TAR=$BANAN_SYSROOT.tar
+export BANAN_SYSROOT="$BANAN_BUILD_DIR/sysroot"
+export BANAN_SYSROOT_TAR="$BANAN_SYSROOT.tar"
 
-export BANAN_DISK_IMAGE_PATH=$BANAN_BUILD_DIR/banan-os.img
+export BANAN_DISK_IMAGE_PATH="$BANAN_BUILD_DIR/banan-os.img"
 
 if [[ -z $BANAN_UEFI_BOOT ]]; then
 	export BANAN_UEFI_BOOT=0
 fi
 
 if [[ -z $BANAN_BOOTLOADER ]]; then
-	export BANAN_BOOTLOADER="BANAN"
+	export BANAN_BOOTLOADER='BANAN'
 fi
 
-export BANAN_CMAKE=$BANAN_TOOLCHAIN_PREFIX/bin/cmake
+export BANAN_CMAKE="$BANAN_TOOLCHAIN_PREFIX/bin/cmake"
diff --git a/toolchain/Toolchain.txt b/toolchain/Toolchain.txt
index e6d3c9befd..ece4cde239 100644
--- a/toolchain/Toolchain.txt
+++ b/toolchain/Toolchain.txt
@@ -30,8 +30,8 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
-set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}/bin/${BANAN_ARCH}-banan_os-g++)
+set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}/bin/${BANAN_ARCH}-pc-banan_os-g++)
 set(CMAKE_CXX_COMPILER_WORKS True)
 
-set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}/bin/${BANAN_ARCH}-banan_os-gcc)
+set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}/bin/${BANAN_ARCH}-pc-banan_os-gcc)
 set(CMAKE_C_COMPILER_WORKS True)
diff --git a/toolchain/build.sh b/toolchain/build.sh
index 6e7bed9191..004f8e7e21 100755
--- a/toolchain/build.sh
+++ b/toolchain/build.sh
@@ -166,7 +166,8 @@ build_grub () {
 		--target="$BANAN_ARCH" \
 		--prefix="$BANAN_TOOLCHAIN_PREFIX" \
 		--with-platform="efi" \
-		--disable-werror
+		--disable-werror \
+		CFLAGS=--std=gnu11
 
 	make $MAKE_JOBS
 	make install
diff --git a/toolchain/gcc-12.2.0.patch b/toolchain/gcc-12.2.0.patch
index c990f6e617..333e168247 100644
--- a/toolchain/gcc-12.2.0.patch
+++ b/toolchain/gcc-12.2.0.patch
@@ -12,12 +12,12 @@ diff -ruN gcc-12.2.0/config.sub gcc-12.2.0-banan_os/config.sub
  	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
 diff -ruN gcc-12.2.0/fixincludes/mkfixinc.sh gcc-12.2.0-banan_os/fixincludes/mkfixinc.sh
 --- gcc-12.2.0/fixincludes/mkfixinc.sh	2022-08-19 11:09:52.160657095 +0300
-+++ gcc-12.2.0-banan_os/fixincludes/mkfixinc.sh	2024-09-03 23:09:34.461106020 +0300
++++ gcc-12.2.0-banan_os/fixincludes/mkfixinc.sh	2025-06-03 18:08:13.366965577 +0300
 @@ -11,6 +11,7 @@
  
  # Check for special fix rules for particular targets
  case $machine in
-+    *-banan_os* | \
++    *-*-banan_os* | \
      i?86-*-cygwin* | \
      i?86-*-mingw32* | \
      x86_64-*-mingw32* | \