pacman: export CC and CXX variables explicitly

msys2 · May 15, 2021 · a40761c · a40761c
1 parent 350f670
commit a40761c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/pacman/PKGBUILD b/pacman/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=pacman
 pkgver=5.2.2
-pkgrel=22
+pkgrel=23
 pkgdesc="A library-based package manager with dependency support (MSYS2 port)"
 arch=('i686' 'x86_64')
 url="https://www.archlinux.org/pacman/"
@@ -65,7 +65,7 @@ validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'  # Allan McRae <allan@a
 sha256sums=('bb201a9f2fb53c28d011f661d50028efce6eef2c1d2a36728bdd0130189349a0'
             'f5a84c5642d57044ddb40387822bfcb01bdbdcd885b46bc93d116aaf0e5741a6'
             '822af13248f04690377cd193370f33ac2f00a41234ead9cf3b7e5d5aba8bd0c5'
-            'e533985757a4fef1e72c3349eb62aebbd14c1d457faf10306218cf637b207030'
+            'b9ad2fb4b0e686b96db0a50d411f4d9344ec8950f50906fb502272037246e4b8'
             '2bd27c3fc5443b367e5025c9b9a35670b02202e48e92eead90755fef8d08fa83'
             '2e2dde573b971011abad5340cb2cd5a4b9a0e8470a2ed94d7a969525e0bed0c1'
             '24ea2c8dca37847e04894ebfd05d1cf5df49dc0c8089f5581c99caa19b77a7ef'

diff --git a/pacman/makepkg_mingw.conf b/pacman/makepkg_mingw.conf
@@ -46,6 +46,8 @@ if [[ "$MSYSTEM" == "MINGW64" ]]; then
   MINGW_CHOST="x86_64-w64-mingw32"
   MINGW_PREFIX="/mingw64"
   MINGW_PACKAGE_PREFIX="mingw-w64-x86_64"
+  CC="gcc"
+  CXX="g++"
   CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
   CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
   CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
@@ -56,6 +58,8 @@ elif [[ "$MSYSTEM" == "MINGW32" ]]; then
   MINGW_CHOST="i686-w64-mingw32"
   MINGW_PREFIX="/mingw32"
   MINGW_PACKAGE_PREFIX="mingw-w64-i686"
+  CC="gcc"
+  CXX="g++"
   CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
   CFLAGS="-march=i686 -mtune=generic -O2 -pipe"
   CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe"
@@ -66,6 +70,8 @@ elif [[ "$MSYSTEM" == "CLANG64" ]]; then
   MINGW_CHOST="x86_64-w64-mingw32"
   MINGW_PREFIX="/clang64"
   MINGW_PACKAGE_PREFIX="mingw-w64-clang-x86_64"
+  CC="clang"
+  CXX="clang++"
   CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
   CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
   CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
@@ -76,6 +82,8 @@ elif [[ "$MSYSTEM" == "CLANG32" ]]; then
   MINGW_CHOST="i686-w64-mingw32"
   MINGW_PREFIX="/clang32"
   MINGW_PACKAGE_PREFIX="mingw-w64-clang-i686"
+  CC="clang"
+  CXX="clang++"
   CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
   CFLAGS="-march=i686 -mtune=generic -O2 -pipe"
   CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe"
@@ -86,6 +94,8 @@ elif [[ "$MSYSTEM" == "CLANGARM64" ]]; then
   MINGW_CHOST="aarch64-w64-mingw32"
   MINGW_PREFIX="/clangarm64"
   MINGW_PACKAGE_PREFIX="mingw-w64-clang-aarch64"
+  CC="clang"
+  CXX="clang++"
   CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
   CFLAGS="-O2 -pipe"
   CXXFLAGS="-O2 -pipe"
@@ -96,6 +106,8 @@ elif [[ "$MSYSTEM" == "UCRT64" ]]; then
   MINGW_CHOST="x86_64-w64-mingw32"
   MINGW_PREFIX="/ucrt64"
   MINGW_PACKAGE_PREFIX="mingw-w64-ucrt-x86_64"
+  CC="gcc"
+  CXX="g++"
   CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
   CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
   CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"