From cfa90447df3b1b350de11e4e73f02ff5ee7a7bde Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Fri, 19 Aug 2022 14:07:25 +0530
Subject: [PATCH] Remove hardcoded CC variable

Those are now set by makepkg
---
 mingw-w64-argon2/PKGBUILD       | 4 ++--
 mingw-w64-dcadec/PKGBUILD       | 2 --
 mingw-w64-http-parser/PKGBUILD  | 1 -
 mingw-w64-libxslt/PKGBUILD      | 2 +-
 mingw-w64-lua51/PKGBUILD        | 2 +-
 mingw-w64-lv2/PKGBUILD          | 2 +-
 mingw-w64-odt2txt/PKGBUILD      | 2 +-
 mingw-w64-pngquant/PKGBUILD     | 1 -
 mingw-w64-rtmpdump-git/PKGBUILD | 4 ++--
 mingw-w64-tolua/PKGBUILD        | 2 +-
 10 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/mingw-w64-argon2/PKGBUILD b/mingw-w64-argon2/PKGBUILD
index eeb878086f..a05084e6b9 100644
--- a/mingw-w64-argon2/PKGBUILD
+++ b/mingw-w64-argon2/PKGBUILD
@@ -49,12 +49,12 @@ build() {
   cp -rf ${srcdir}/phc-winner-argon2-${pkgver} "${srcdir}/build-${MINGW_CHOST}"
   cd "${srcdir}/build-${MINGW_CHOST}"
 
-  make CC=${MINGW_PREFIX}/bin/gcc AR=${MINGW_PREFIX}/bin/ar OPTTARGET=${_march}
+  make AR=${MINGW_PREFIX}/bin/ar OPTTARGET=${_march}
 }
 
 package() {
   cd "${srcdir}/build-${MINGW_CHOST}"
-  make install DESTDIR="${pkgdir}" CC=${MINGW_PREFIX}/bin/gcc AR=${MINGW_PREFIX}/bin/ar PREFIX="${MINGW_PREFIX}" OPTTARGET=${_march}
+  make install DESTDIR="${pkgdir}" AR=${MINGW_PREFIX}/bin/ar PREFIX="${MINGW_PREFIX}" OPTTARGET=${_march}
 
   install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
   install -Dm644 ${srcdir}/libargon2.pc "${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/libargon2.pc"
diff --git a/mingw-w64-dcadec/PKGBUILD b/mingw-w64-dcadec/PKGBUILD
index 3f6c967803..8ce81b06ab 100644
--- a/mingw-w64-dcadec/PKGBUILD
+++ b/mingw-w64-dcadec/PKGBUILD
@@ -49,7 +49,6 @@ build() {
   CONFIG_NDEBUG=1 \
   CONFIG_WINDOWS=1 \
   CONFIG_SHARED=1 \
-  CC=gcc \
   make all -f "${srcdir}/${_realname}-${pkgver}/Makefile"
 
   # Build static lib.
@@ -61,7 +60,6 @@ build() {
   PREFIX=$MINGW_PREFIX \
   CONFIG_NDEBUG=1 \
   CONFIG_WINDOWS=1 \
-  CC=gcc \
   make lib -f "${srcdir}/${_realname}-${pkgver}/Makefile"
 }
 
diff --git a/mingw-w64-http-parser/PKGBUILD b/mingw-w64-http-parser/PKGBUILD
index 4ca3539b27..4a79036b77 100644
--- a/mingw-w64-http-parser/PKGBUILD
+++ b/mingw-w64-http-parser/PKGBUILD
@@ -29,7 +29,6 @@ build() {
   mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
   cp -R ${srcdir}/${_realname}-${pkgver}/. "${srcdir}"/build-${CARCH}
 
-  CC=${MINGW_PREFIX}/bin/gcc \
   AR=${MINGW_PREFIX}/bin/ar \
   SONAME=libhttp_parser-2.dll \
   LIBNAME=libhttp_parser-2.dll \
diff --git a/mingw-w64-libxslt/PKGBUILD b/mingw-w64-libxslt/PKGBUILD
index 6b70379d38..e6a6a4164f 100644
--- a/mingw-w64-libxslt/PKGBUILD
+++ b/mingw-w64-libxslt/PKGBUILD
@@ -83,7 +83,7 @@ build() {
     --with-libxml-prefix=${MINGW_PREFIX} \
     --without-python
 
-  CC=${MINGW_PREFIX}/bin/gcc make
+  make
 }
 
 package() {
diff --git a/mingw-w64-lua51/PKGBUILD b/mingw-w64-lua51/PKGBUILD
index f7b927dec1..2234d90756 100644
--- a/mingw-w64-lua51/PKGBUILD
+++ b/mingw-w64-lua51/PKGBUILD
@@ -55,7 +55,7 @@ build() {
     AR="ar rcu" \
     RANLIB="ranlib" \
     STRIP="strip" \
-    CC="${MINGW_CHOST}-gcc" \
+    CC="${CC}" \
     mingw
 
   # Check we do not encounter:
diff --git a/mingw-w64-lv2/PKGBUILD b/mingw-w64-lv2/PKGBUILD
index 078a0021f8..82a20f9f6a 100644
--- a/mingw-w64-lv2/PKGBUILD
+++ b/mingw-w64-lv2/PKGBUILD
@@ -34,7 +34,7 @@ build() {
   DEST_OS=win32 \
   TARGET=${MINGW_CHOST} \
   PKG_CONFIG=${MINGW_PREFIX}/bin/pkg-config \
-  CC=gcc PERL=/usr/bin/perl \
+  PERL=/usr/bin/perl \
   AR=${MINGW_PREFIX}/bin/ar \
   WINDRES=${MINGW_PREFIX}/bin/windres \
   RST2MAN=${MINGW_PREFIX}/bin/rst2man3 \
diff --git a/mingw-w64-odt2txt/PKGBUILD b/mingw-w64-odt2txt/PKGBUILD
index 3d10e684bf..6db48cfe9d 100644
--- a/mingw-w64-odt2txt/PKGBUILD
+++ b/mingw-w64-odt2txt/PKGBUILD
@@ -29,7 +29,7 @@ build() {
   [[ "$CARCH" == "i686" ]] && arch_make=32
 
   cd "${srcdir}/${_realname}-${pkgver}"
-  make ARCH=${arch_make} CC=${MINGW_PREFIX}/bin/gcc
+  make ARCH=${arch_make}
 }
 
 package() {
diff --git a/mingw-w64-pngquant/PKGBUILD b/mingw-w64-pngquant/PKGBUILD
index 94da506b88..c5c52a1e71 100644
--- a/mingw-w64-pngquant/PKGBUILD
+++ b/mingw-w64-pngquant/PKGBUILD
@@ -34,7 +34,6 @@ build() {
     SSE="--enable-sse"
   fi
   ./configure --prefix=${MINGW_PREFIX} \
-    CC="${MINGW_PREFIX}/bin/gcc" \
     --with-libimagequant=${MINGW_PREFIX}/lib/ \
     ${SSE}
   make --jobs=1
diff --git a/mingw-w64-rtmpdump-git/PKGBUILD b/mingw-w64-rtmpdump-git/PKGBUILD
index a49e999a9d..201a09f754 100644
--- a/mingw-w64-rtmpdump-git/PKGBUILD
+++ b/mingw-w64-rtmpdump-git/PKGBUILD
@@ -73,11 +73,11 @@ prepare() {
 build() {
   cp -rf "${srcdir}/$_realname" "${srcdir}/build-${MINGW_CHOST}"
   cd "${srcdir}/build-${MINGW_CHOST}"
-  make CC=gcc LD=ld AR=ar SYS=mingw
+  make CC=${CC} LD=ld AR=ar SYS=mingw
 }
 
 package() {
   cd "${srcdir}/build-${MINGW_CHOST}"
   mkdir -p ${pkgdir}${MINGW_PREFIX}/lib
-  make CC=gcc LD=ld AR=ar SYS=mingw prefix=${MINGW_PREFIX} mandir=${MINGW_PREFIX}/share/man DESTDIR="${pkgdir}" install
+  make CC=${CC} LD=ld AR=ar SYS=mingw prefix=${MINGW_PREFIX} mandir=${MINGW_PREFIX}/share/man DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-tolua/PKGBUILD b/mingw-w64-tolua/PKGBUILD
index 2584b8a0f9..b615cef8c3 100644
--- a/mingw-w64-tolua/PKGBUILD
+++ b/mingw-w64-tolua/PKGBUILD
@@ -25,7 +25,7 @@ build() {
     AR="ar rcu" \
     RANLIB="ranlib" \
     STRIP="strip" \
-    CC="${MINGW_CHOST}-gcc"
+    CC="${CC}"
 }
 
 package(){