Sinipelto
/
banan-os
forked from Bananymous/banan-os
1
0
Fork 0
Code Pull Requests Activity

BuildSystem: Rename toolchain -> x86_64-pc-banan_os

This commit is contained in:
Bananymous 2025-06-03 23:02:10 +03:00
parent 84b1f3990c
commit 11174bfa14
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
script/config.sh
View File

@ -8,28 +8,28 @@ if [[ -z $BANAN_ROOT_DIR ]]; then
fi fi
if [[ -z $BANAN_ARCH ]]; then if [[ -z $BANAN_ARCH ]]; then
export BANAN_ARCH=x86_64 export BANAN_ARCH='x86_64'
fi fi
export BANAN_TOOLCHAIN_DIR=$BANAN_ROOT_DIR/toolchain export BANAN_TOOLCHAIN_DIR="$BANAN_ROOT_DIR/toolchain"
export BANAN_TOOLCHAIN_PREFIX=$BANAN_TOOLCHAIN_DIR/local export BANAN_TOOLCHAIN_PREFIX="$BANAN_TOOLCHAIN_DIR/local"
export BANAN_TOOLCHAIN_TRIPLE=$BANAN_ARCH-banan_os 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="$BANAN_BUILD_DIR/sysroot"
export BANAN_SYSROOT_TAR=$BANAN_SYSROOT.tar 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 if [[ -z $BANAN_UEFI_BOOT ]]; then
export BANAN_UEFI_BOOT=0 export BANAN_UEFI_BOOT=0
fi fi
if [[ -z $BANAN_BOOTLOADER ]]; then if [[ -z $BANAN_BOOTLOADER ]]; then
export BANAN_BOOTLOADER="BANAN" export BANAN_BOOTLOADER='BANAN'
fi fi
export BANAN_CMAKE=$BANAN_TOOLCHAIN_PREFIX/bin/cmake export BANAN_CMAKE="$BANAN_TOOLCHAIN_PREFIX/bin/cmake"

4
toolchain/Toolchain.txt
View File

@ -30,8 +30,8 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH)
set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED True) 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_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) set(CMAKE_C_COMPILER_WORKS True)

3
toolchain/build.sh
View File

@ -166,7 +166,8 @@ build_grub () {
--target="$BANAN_ARCH" \ --target="$BANAN_ARCH" \
--prefix="$BANAN_TOOLCHAIN_PREFIX" \ --prefix="$BANAN_TOOLCHAIN_PREFIX" \
--with-platform="efi" \ --with-platform="efi" \
--disable-werror --disable-werror \
CFLAGS=--std=gnu11
make $MAKE_JOBS make $MAKE_JOBS
make install make install

4
toolchain/gcc-12.2.0.patch
View File

@ -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*) 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 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/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 @@ @@ -11,6 +11,7 @@
# Check for special fix rules for particular targets # Check for special fix rules for particular targets
case $machine in case $machine in
+ *-banan_os* | \ + *-*-banan_os* | \
i?86-*-cygwin* | \ i?86-*-cygwin* | \
i?86-*-mingw32* | \ i?86-*-mingw32* | \
x86_64-*-mingw32* | \ x86_64-*-mingw32* | \