From 9069c627a96b65896f1015ef15723b6b2d28608f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Sat, 6 Oct 2018 00:29:14 +0300
Subject: [PATCH] Install unprefixed tools when cross compiling the toolchain

---
 build-cross-tools.sh | 2 +-
 install-wrappers.sh  | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/build-cross-tools.sh b/build-cross-tools.sh
index 6a3a41c..5ed2915 100755
--- a/build-cross-tools.sh
+++ b/build-cross-tools.sh
@@ -16,6 +16,6 @@ export HOST=$CROSS_ARCH-w64-mingw32
 
 ./build-llvm.sh $PREFIX
 ./strip-llvm.sh $PREFIX
-./install-wrappers.sh $PREFIX
 ./build-mingw-w64-widl.sh $PREFIX
+./install-wrappers.sh $PREFIX
 ./prepare-cross-toolchain.sh $NATIVE $PREFIX $CROSS_ARCH
diff --git a/install-wrappers.sh b/install-wrappers.sh
index 8dcedef..4c15cab 100755
--- a/install-wrappers.sh
+++ b/install-wrappers.sh
@@ -64,4 +64,12 @@ if [ -n "$EXEEXT" ]; then
     if [ ! -L clang$EXEEXT ]; then
         mv clang$EXEEXT clang-$CLANG_MAJOR$EXEEXT
     fi
+    if [ -n "$HOST" ]; then
+        for exec in clang clang++ gcc g++ ar ranlib nm strings widl; do
+            ln -sf $HOST-$exec$EXEEXT $exec$EXEEXT
+        done
+        for exec in ld objdump windres dlltool objcopy strip; do
+            ln -sf $HOST-$exec $exec
+        done
+    fi
 fi