From 58d098dfae9ff876c051a8729cfaa5aa1961276b Mon Sep 17 00:00:00 2001
From: cowmonk <cowmonk@based.pt>
Date: Sat, 15 Nov 2025 10:15:15 -0700
Subject: [PATCH] Reworking the toolchain

We need to make a cross compiler first before then targeting the actual
toolchain
---
 Makefile                           |  3 +--
 scripts/headers.sh                 |  2 --
 scripts/{musl.sh => musl-cross.sh} | 15 ++++++---------
 3 files changed, 7 insertions(+), 13 deletions(-)
 rename scripts/{musl.sh => musl-cross.sh} (70%)

diff --git a/Makefile b/Makefile
index 4a1ff64..345b0fb 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,7 @@ pull:
 	fi
 
 build: init
-	./scripts/headers.sh	
-	./scripts/musl.sh
+	./scripts/musl-cross.sh
 
 init:
 	@if [ ! -d ./build/${FROOT} ]; then \
diff --git a/scripts/headers.sh b/scripts/headers.sh
index b996f6f..999f659 100755
--- a/scripts/headers.sh
+++ b/scripts/headers.sh
@@ -38,5 +38,3 @@ make headers
 find usr/include -type f ! -name '*.h' -delete
 cp -rv usr/include/* ../"$FROOT"/include/
 
-exit
-
diff --git a/scripts/musl.sh b/scripts/musl-cross.sh
similarity index 70%
rename from scripts/musl.sh
rename to scripts/musl-cross.sh
index 98f8120..cd7c7c0 100755
--- a/scripts/musl.sh
+++ b/scripts/musl-cross.sh
@@ -2,7 +2,7 @@
 set -eu
 
 ARCH=$(uname -m)
-FROOT="./build/$ARCH-musllvm"
+FROOT="../$ARCH-musllvm" # make install in source dir
 MUSL_TAR=$(ls ./sources/musl-*.tar.* 2>/dev/null | head -n 1 | xargs basename)
 if [ -z "$MUSL_TAR" ]; then
         echo "ERR: No Musl tarball found in sources directory"
@@ -23,16 +23,13 @@ else
         echo "Musl source already extracted."
 fi
 
-echo "Buliding musl"
-if [ -f ./build/"$FROOT"/include/libc.so ]; then
-        echo "Musl already built, skipping..."
+echo "Buliding musl headers"
+if [ -f "./build/$MUSL_SOURCE" ]; then
+        echo "Musl headers already built, skipping..."
         exit
 fi
 
 cd ./build/"$MUSL_SOURCE"
 
-./configure \
-        --prefix=/ \
-
-make -j$(nproc)
-DESTDIR=$FROOT make install
+echo "Installing musl headers..."
+DESTDIR=$FROOT make ARCH=$(uname -m) install-headers