From 17fb057dceacb56aaf2437948dbceb9c2b16bc47 Mon Sep 17 00:00:00 2001
From: belliash <belliash@codingworkshop.eu.org>
Date: Fri, 14 Aug 2020 23:41:23 +0200
Subject: [PATCH] Optimize the building process a bit and facilitate adding new
 tools.

---
 build-linux.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/build-linux.sh b/build-linux.sh
index bcc333c..9aaea7b 100755
--- a/build-linux.sh
+++ b/build-linux.sh
@@ -560,21 +560,21 @@ xtchain_build()
     mkdir -p ${BINDIR}/lib/xtchain
     mkdir -p ${BINDIR}/${GENERIC}/bin
     cp ${WRKDIR}/scripts/*-wrapper ${BINDIR}/${GENERIC}/bin
-    gcc ${WRKDIR}/tools/windres.c -o ${BINDIR}/bin/windres
-    gcc ${WRKDIR}/tools/xtcspecc.c -o ${BINDIR}/bin/xtcspecc
-    cd ${BINDIR}/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 ${ARCH}-w64-mingw32-${EXEC}
+            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} ${ARCH}-w64-mingw32-${EXEC}
+            ln -sf llvm-${EXEC} ${BINDIR}/bin/${ARCH}-w64-mingw32-${EXEC}
         done
         for EXEC in dlltool ld objdump; do
-            ln -sf ../${GENERIC}/bin/${EXEC}-wrapper ${ARCH}-w64-mingw32-${EXEC}
+            ln -sf ../${GENERIC}/bin/${EXEC}-wrapper ${BINDIR}/bin/${ARCH}-w64-mingw32-${EXEC}
         done
         for EXEC in windres xtcspecc; do
-            ln -sf ${EXEC} ${ARCH}-w64-mingw32-${EXEC}
+            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
     done
     cp ${WRKDIR}/scripts/xtclib ${BINDIR}/lib/xtchain/