From 0b5819ad612e11cd84650b2852c19db49e889b4e Mon Sep 17 00:00:00 2001
From: Aiken Harris <harraiken@noreply.codingworkshop.git>
Date: Mon, 7 Jul 2025 10:13:56 +0200
Subject: [PATCH] Fix xtchain tools build

---
 build.sh | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/build.sh b/build.sh
index eee9377..ca4f362 100755
--- a/build.sh
+++ b/build.sh
@@ -346,34 +346,33 @@ wine_fetch()
     fi
 }
 
-# This function installs XTCHAIN scripts, wrappers and symlinks
+# This function installs XTCHAIN tools and scripts
 xtchain_build()
 {
-    # Build XTChain
-    echo ">>> Building XTchain ..."
+    # Target-specific configuration options
+    case "${SYSTEM_NAME}" in
+        Windows)
+            CCOMPILER="${SYSTEM_HOST-gcc}"
+            EXTENSION=".ps1"
+            ;;
+        *)
+            CCOMPILER="clang"
+            EXTENSION=""
+    esac
+
+    # Build XTchain tools
+    echo ">>> Building XTchain tools ..."
     mkdir -p ${BINDIR}/bin
     mkdir -p ${BINDIR}/lib/xtchain
     mkdir -p ${BINDIR}/${GENERIC}/bin
     cp ${WRKDIR}/scripts/*-wrapper ${BINDIR}/${GENERIC}/bin
-    for ARCH in ${ARCHS}; do
-#        for EXEC in c++ c11 c99 cc clang clang++ g++ gcc; do
-#            ln -sf ../${GENERIC}/bin/clang-target-wrapper ${BINDIR}/bin/${ARCH}-w64-mingw32-${EXEC}
-#        done
-#        for EXEC in addr2line ar as nm objcopy pdbutil ranlib rc strings strip; do
-#            ln -sf llvm-${EXEC} ${BINDIR}/bin/${ARCH}-w64-mingw32-${EXEC}
-#        done
-#        for EXEC in dlltool ld objdump; do
-#            ln -sf ../${GENERIC}/bin/${EXEC}-wrapper ${BINDIR}/bin/${ARCH}-w64-mingw32-${EXEC}
-#        done
-        for EXEC in bin2c exetool windres xtcspecc; do
-            if [ ! -e ${BINDIR}/bin/${EXEC} ]; then
-                gcc ${WRKDIR}/tools/${EXEC}.c -o ${BINDIR}/bin/${EXEC}
-            fi
-#            ln -sf ${EXEC} ${BINDIR}/bin/${ARCH}-w64-mingw32-${EXEC}
-        done
+    for EXEC in bin2c exetool xtcspecc; do
+        if [ ! -e ${BINDIR}/bin/${EXEC} ]; then
+            ${CCOMPILER} ${WRKDIR}/tools/${EXEC}.c -o ${BINDIR}/bin/${EXEC}
+        fi
     done
-    cp ${WRKDIR}/scripts/xtclib ${BINDIR}/lib/xtchain/
-    cp ${WRKDIR}/scripts/xtchain ${BINDIR}/
+    cp ${WRKDIR}/scripts/xtclib${EXTENSION} ${BINDIR}/lib/xtchain/
+    cp ${WRKDIR}/scripts/xtchain${EXTENSION} ${BINDIR}/
 }