From d4a27dfd806a8c4b4f550303e26ace1e74c031f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Tue, 13 Aug 2019 12:51:42 +0300
Subject: [PATCH] Stop manually setting CC/AR/RANLIB when building autotools
 projects

Since we have triplet prefixed wrappers for all tools, and wrappers
named <triplet>-gcc/g++ as well, we don't need to manually provide
them.
---
 build-mingw-w64-libraries.sh | 3 +--
 build-mingw-w64.sh           | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/build-mingw-w64-libraries.sh b/build-mingw-w64-libraries.sh
index cdd3b38..7b4e1d5 100755
--- a/build-mingw-w64-libraries.sh
+++ b/build-mingw-w64-libraries.sh
@@ -22,8 +22,7 @@ for lib in winpthreads winstorecompat; do
     for arch in $ARCHS; do
         mkdir -p build-$arch
         cd build-$arch
-        ../configure --host=$arch-w64-mingw32 --prefix=$PREFIX/$arch-w64-mingw32 \
-            CC=$arch-w64-mingw32-clang AR=llvm-ar RANLIB=llvm-ranlib
+        ../configure --host=$arch-w64-mingw32 --prefix=$PREFIX/$arch-w64-mingw32
         make -j$CORES
         make install
         cd ..
diff --git a/build-mingw-w64.sh b/build-mingw-w64.sh
index 9431f29..39f36a1 100755
--- a/build-mingw-w64.sh
+++ b/build-mingw-w64.sh
@@ -101,8 +101,7 @@ if [ -z "$HOST" ]; then
             ;;
         esac
         FLAGS="$FLAGS --with-default-msvcrt=$DEFAULT_MSVCRT"
-        ../configure --host=$arch-w64-mingw32 --prefix=$PREFIX/$arch-w64-mingw32 $FLAGS \
-            CC=$arch-w64-mingw32-clang AR=llvm-ar RANLIB=llvm-ranlib DLLTOOL=llvm-dlltool
+        ../configure --host=$arch-w64-mingw32 --prefix=$PREFIX/$arch-w64-mingw32 $FLAGS
         make -j$CORES
         make install
         cd ..