NFC: Use MSYSTEM for build directories instead of CARCH and MINGW_CHOST

To be able to build for separate environments in the same machine.

mingw-w64-4th/PKGBUILD

@@ -18,9 +18,9 @@ sha256sums=('e51ced7e71c942a27104baeae6cff68f44ae37a1c5813b6c12f9a3a1cfde309a')
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}/sources/"
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
-  cp -R ${srcdir}/${_realname}-${pkgver}/sources/. "${srcdir}"/build-${CARCH}
+  cp -R ${srcdir}/${_realname}-${pkgver}/sources/. "${srcdir}"/build-${MSYSTEM}
   CROSS="${MINGW_PREFIX}/bin/" \
   make -f Makefile.W32 CC="$CC"
 }

mingw-w64-SDL/PKGBUILD

@@ -34,9 +34,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   ../SDL-1.2/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -49,7 +49,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
   sed -e "s|-mwindows||g" -i ${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/sdl.pc
 }

mingw-w64-SDL2_gfx/PKGBUILD

@@ -22,8 +22,8 @@ prepare() {
 
 build() {
   export lt_cv_deplibs_check_method='pass_all'
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
 
   local extra_config=""
   case "${CARCH}" in
@@ -34,7 +34,7 @@ build() {
       ;;
   esac
 
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -45,7 +45,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
   install -Dm644 "${srcdir}"/${_realname}-${pkgver}/COPYING "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 }

mingw-w64-SDL_gfx/PKGBUILD

@@ -21,9 +21,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   declare -a _extra_config
 
@@ -43,7 +43,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   make DESTDIR="${pkgdir}" install
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" \

mingw-w64-SDL_image/PKGBUILD

@@ -34,9 +34,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   export lt_cv_deplibs_check_method='pass_all'
   ../${_realname}-${pkgver}/configure \
@@ -50,7 +50,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}/"
+  cd "${srcdir}/build-${MSYSTEM}/"
 
   make DESTDIR="${pkgdir}/" install
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" \

mingw-w64-SDL_mixer/PKGBUILD

@@ -63,9 +63,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   export lt_cv_deplibs_check_method='pass_all'
   ../${_realname}-${pkgver}/configure \
@@ -81,7 +81,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}/"
+  cd "${srcdir}/build-${MSYSTEM}/"
 
   make DESTDIR="${pkgdir}/" install
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" \

mingw-w64-SDL_net/PKGBUILD

@@ -16,9 +16,9 @@ source=(https://libsdl.org/projects/SDL_net/release/${_realname}-${pkgver}.tar.g
 sha256sums=('5f4a7a8bb884f793c278ac3f3713be41980c5eedccecff0260411347714facb4')
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -30,7 +30,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}/"
+  cd "${srcdir}/build-${MSYSTEM}/"
 
   make DESTDIR="${pkgdir}/" install
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" \

mingw-w64-SDL_ttf/PKGBUILD

@@ -38,8 +38,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -52,7 +52,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
   install -Dm644 "${srcdir}"/${_realname}-${pkgver}/COPYING "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 }

mingw-w64-a52dec/PKGBUILD

@@ -30,8 +30,8 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
+  mkdir build-${MSYSTEM} && cd build-${MSYSTEM}
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -43,7 +43,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
   install -m644 ${srcdir}/${_realname}-${pkgver}/liba52/a52_internal.h "${pkgdir}${MINGW_PREFIX}/include/a52dec/"
 }

mingw-w64-akira/PKGBUILD

@@ -32,9 +32,9 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir -p build-${MINGW_CHOST}
+  mkdir -p build-${MSYSTEM}
-  cd build-${MINGW_CHOST}
+  cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   meson \
@@ -48,7 +48,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   DESTDIR="${pkgdir}" meson install
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"

mingw-w64-alure/PKGBUILD

@@ -40,9 +40,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
@@ -54,7 +54,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install ./
 

mingw-w64-alure2/PKGBUILD

@@ -36,9 +36,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
@@ -51,7 +51,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build . --target install
 

mingw-w64-apr/PKGBUILD

@@ -79,7 +79,7 @@ build() {
 }
 
 #check() {
-#  cd "${srcdir}/build-${MINGW_CHOST}"
+#  cd "${srcdir}/build-${MSYSTEM}"
 #  make -j1 check
 #}
 

mingw-w64-argon2/PKGBUILD

@@ -45,15 +45,15 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  cp -rf ${srcdir}/phc-winner-argon2-${pkgver} "${srcdir}/build-${MINGW_CHOST}"
+  cp -rf ${srcdir}/phc-winner-argon2-${pkgver} "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   make AR=${MINGW_PREFIX}/bin/ar OPTTARGET=${_march}
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make install DESTDIR="${pkgdir}" AR=${MINGW_PREFIX}/bin/ar PREFIX="${MINGW_PREFIX}" OPTTARGET=${_march}
 
   install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"

mingw-w64-argtable/PKGBUILD

@@ -30,8 +30,8 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
-  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
   ../${_realname}${intver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -43,6 +43,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 }

mingw-w64-aribb24/PKGBUILD

@@ -25,8 +25,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -38,6 +38,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make -j1 DESTDIR="${pkgdir}" install
 }

mingw-w64-bin2header/PKGBUILD

@@ -18,8 +18,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-ninja")
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
-  mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   declare -a extra_config
   if check_option "debug" "n"; then
@@ -39,6 +39,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
 }

mingw-w64-breakpad-git/PKGBUILD

@@ -69,9 +69,9 @@ prepare() {
 
 build() {
     msg2 "Synchronizing build directory"
-    rsync --recursive --times --links "${srcdir}/${_realname}.patched"/* "${srcdir}/${_realname}.build.${CARCH}"
+    rsync --recursive --times --links "${srcdir}/${_realname}.patched"/* "${srcdir}/${_realname}.build.${MSYSTEM}"
 
-    cd "${srcdir}/${_realname}.build.${CARCH}"
+    cd "${srcdir}/${_realname}.build.${MSYSTEM}"
     ./configure \
       --prefix=${MINGW_PREFIX} \
       --build=${MINGW_CHOST} \
@@ -81,13 +81,13 @@ build() {
     make CXXFLAGS="-DUNICODE -D_UNICODE -g" AR=${MINGW_PREFIX}/bin/ar RC=${MINGW_PREFIX}/bin/windres
 
     # use gyp to generate a Makefile to build the Windows client library
-    cd "${srcdir}/${_realname}.build.${CARCH}/src/"
+    cd "${srcdir}/${_realname}.build.${MSYSTEM}/src/"
     gyp --no-circular-check --depth=. -f make client/windows/breakpad_client.gyp
     make CXXFLAGS="-DUNICODE -D_UNICODE -D_POSIX_C_SOURCE -g" AR=${MINGW_PREFIX}/bin/ar RC=${MINGW_PREFIX}/bin/windres out/Debug/crash_generation_app out/Debug/obj.target/client/windows/sender/libcrash_report_sender.a
 }
 
 package() {
-    cd "${srcdir}/${_realname}.build.${CARCH}"
+    cd "${srcdir}/${_realname}.build.${MSYSTEM}"
     make CXXFLAGS="-DUNICODE -D_UNICODE -g" AR=${MINGW_PREFIX}/bin/ar RC=${MINGW_PREFIX}/bin/windres DESTDIR="${pkgdir}" install
 
     # Install headers
@@ -95,26 +95,26 @@ package() {
     cd "${pkgdir}${MINGW_PREFIX}/include/breakpad"
 
     mkdir -p "${pkgdir}${MINGW_PREFIX}/include/breakpad/common/"
-    cp -v ${srcdir}/${_realname}.build.${CARCH}/src/google_breakpad/common/* common/
+    cp -v ${srcdir}/${_realname}.build.${MSYSTEM}/src/google_breakpad/common/* common/
-    cp -v ${srcdir}/${_realname}.build.${CARCH}/src/common/scoped_ptr.h common/
+    cp -v ${srcdir}/${_realname}.build.${MSYSTEM}/src/common/scoped_ptr.h common/
 
     mkdir -p "${pkgdir}${MINGW_PREFIX}/include/breakpad/common/windows"
-    cp -v ${srcdir}/${_realname}.build.${CARCH}/src/common/windows/string_utils-inl.h common/windows/
+    cp -v ${srcdir}/${_realname}.build.${MSYSTEM}/src/common/windows/string_utils-inl.h common/windows/
 
     mkdir -p "${pkgdir}${MINGW_PREFIX}/include/breakpad/client/windows/crash_generation"
-    cp -v ${srcdir}/${_realname}.build.${CARCH}/src/client/windows/crash_generation/client_info.h client/windows/crash_generation/
+    cp -v ${srcdir}/${_realname}.build.${MSYSTEM}/src/client/windows/crash_generation/client_info.h client/windows/crash_generation/
-    cp -v ${srcdir}/${_realname}.build.${CARCH}/src/client/windows/crash_generation/crash_generation_client.h client/windows/crash_generation/
+    cp -v ${srcdir}/${_realname}.build.${MSYSTEM}/src/client/windows/crash_generation/crash_generation_client.h client/windows/crash_generation/
-    cp -v ${srcdir}/${_realname}.build.${CARCH}/src/client/windows/crash_generation/crash_generation_server.h client/windows/crash_generation/
+    cp -v ${srcdir}/${_realname}.build.${MSYSTEM}/src/client/windows/crash_generation/crash_generation_server.h client/windows/crash_generation/
-    cp -v ${srcdir}/${_realname}.build.${CARCH}/src/client/windows/crash_generation/minidump_generator.h client/windows/crash_generation/
+    cp -v ${srcdir}/${_realname}.build.${MSYSTEM}/src/client/windows/crash_generation/minidump_generator.h client/windows/crash_generation/
 
     mkdir -p "${pkgdir}${MINGW_PREFIX}/include/breakpad/client/windows/common"
-    cp -v ${srcdir}/${_realname}.build.${CARCH}/src/client/windows/common/ipc_protocol.h client/windows/common/
+    cp -v ${srcdir}/${_realname}.build.${MSYSTEM}/src/client/windows/common/ipc_protocol.h client/windows/common/
 
     mkdir -p "${pkgdir}${MINGW_PREFIX}/include/breakpad/client/windows/handler"
-    cp -v ${srcdir}/${_realname}.build.${CARCH}/src/client/windows/handler/exception_handler.h client/windows/handler/
+    cp -v ${srcdir}/${_realname}.build.${MSYSTEM}/src/client/windows/handler/exception_handler.h client/windows/handler/
 
     mkdir -p "${pkgdir}${MINGW_PREFIX}/include/breakpad/client/windows/sender"
-    cp -v ${srcdir}/${_realname}.build.${CARCH}/src/client/windows/sender/crash_report_sender.h client/windows/sender/
+    cp -v ${srcdir}/${_realname}.build.${MSYSTEM}/src/client/windows/sender/crash_report_sender.h client/windows/sender/
 
     # Headers aren't really designed to be installed, so we need to do some
     # rewriting to make them usefully included using "include <breakpad/somepath/someheader>"
@@ -128,17 +128,17 @@ package() {
     local _windir=$(cygpath -wm ${srcdir})
     ${MINGW_PREFIX}/bin/ar -M <<EOF
 CREATE libbreakpad_client.a
-ADDLIB ${_windir}/${_realname}.build.${CARCH}/src/out/Debug/obj.target/client/windows/crash_generation/libcrash_generation_client.a
+ADDLIB ${_windir}/${_realname}.build.${MSYSTEM}/src/out/Debug/obj.target/client/windows/crash_generation/libcrash_generation_client.a
-ADDLIB ${_windir}/${_realname}.build.${CARCH}/src/out/Debug/obj.target/client/windows/crash_generation/libcrash_generation_server.a
+ADDLIB ${_windir}/${_realname}.build.${MSYSTEM}/src/out/Debug/obj.target/client/windows/crash_generation/libcrash_generation_server.a
-ADDLIB ${_windir}/${_realname}.build.${CARCH}/src/out/Debug/obj.target/client/windows/handler/libexception_handler.a
+ADDLIB ${_windir}/${_realname}.build.${MSYSTEM}/src/out/Debug/obj.target/client/windows/handler/libexception_handler.a
-ADDLIB ${_windir}/${_realname}.build.${CARCH}/src/out/Debug/obj.target/client/windows/libcommon.a
+ADDLIB ${_windir}/${_realname}.build.${MSYSTEM}/src/out/Debug/obj.target/client/windows/libcommon.a
-ADDLIB ${_windir}/${_realname}.build.${CARCH}/src/out/Debug/obj.target/client/windows/sender/libcrash_report_sender.a
+ADDLIB ${_windir}/${_realname}.build.${MSYSTEM}/src/out/Debug/obj.target/client/windows/sender/libcrash_report_sender.a
 SAVE
 END
 EOF
 
     # Install the pkgconfig file
-    cp -v "${srcdir}/${_realname}.build.${CARCH}/breakpad-client.pc" pkgconfig
+    cp -v "${srcdir}/${_realname}.build.${MSYSTEM}/breakpad-client.pc" pkgconfig
 
     # License
     cd "${pkgdir}${MINGW_PREFIX}/share"
@@ -151,14 +151,14 @@ EOF
     cd "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}/sample"
     cp -v ${srcdir}/README.sample .
     cp -v ${srcdir}/Makefile .
-    cp -v ${srcdir}/${_realname}.build.${CARCH}/src/client/windows/tests/crash_generation_app/abstract_class.cc .
+    cp -v ${srcdir}/${_realname}.build.${MSYSTEM}/src/client/windows/tests/crash_generation_app/abstract_class.cc .
-    cp -v ${srcdir}/${_realname}.build.${CARCH}/src/client/windows/tests/crash_generation_app/abstract_class.h .
+    cp -v ${srcdir}/${_realname}.build.${MSYSTEM}/src/client/windows/tests/crash_generation_app/abstract_class.h .
-    cp -v ${srcdir}/${_realname}.build.${CARCH}/src/client/windows/tests/crash_generation_app/crash_generation_app.cc .
+    cp -v ${srcdir}/${_realname}.build.${MSYSTEM}/src/client/windows/tests/crash_generation_app/crash_generation_app.cc .
-    cp -v ${srcdir}/${_realname}.build.${CARCH}/src/client/windows/tests/crash_generation_app/crash_generation_app.h .
+    cp -v ${srcdir}/${_realname}.build.${MSYSTEM}/src/client/windows/tests/crash_generation_app/crash_generation_app.h .
-    cp -v ${srcdir}/${_realname}.build.${CARCH}/src/client/windows/tests/crash_generation_app/crash_generation_app.ico .
+    cp -v ${srcdir}/${_realname}.build.${MSYSTEM}/src/client/windows/tests/crash_generation_app/crash_generation_app.ico .
-    cp -v ${srcdir}/${_realname}.build.${CARCH}/src/client/windows/tests/crash_generation_app/resource.h .
+    cp -v ${srcdir}/${_realname}.build.${MSYSTEM}/src/client/windows/tests/crash_generation_app/resource.h .
-    cp -v ${srcdir}/${_realname}.build.${CARCH}/src/client/windows/tests/crash_generation_app/resource.rc .
+    cp -v ${srcdir}/${_realname}.build.${MSYSTEM}/src/client/windows/tests/crash_generation_app/resource.rc .
-    cp -v ${srcdir}/${_realname}.build.${CARCH}/src/client/windows/tests/crash_generation_app/small.ico .
+    cp -v ${srcdir}/${_realname}.build.${MSYSTEM}/src/client/windows/tests/crash_generation_app/small.ico .
 
     # Rewrite includes in sample for the rewritten installed headers
     sed -i -e's#client/windows/tests/crash_generation_app/##' ${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}/sample/*

mingw-w64-bzip2/PKGBUILD

@@ -43,8 +43,8 @@ prepare() {
 }
 
 build() {
-  mkdir -p "${srcdir}/build-${CARCH}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -56,12 +56,12 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make -k check
 }
 
 package() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
   # rm "${pkgdir}${MINGW_PREFIX}/bin/bz"{diff,grep,more}
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"

mingw-w64-cantarell-fonts/PKGBUILD

@@ -22,10 +22,10 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
   cp -r "../${_realname}-$pkgver/prebuilt" \
-    ${srcdir}/build-${MINGW_CHOST}
+    ${srcdir}/build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=;-Dfontsdir=" \
   ${MINGW_PREFIX}/bin/meson \
@@ -40,7 +40,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   DESTDIR="${pkgdir}" ninja install
 

mingw-w64-chipmunk/PKGBUILD

@@ -22,8 +22,8 @@ prepare() {
 
 build() {
 
-  mkdir -p "${srcdir}/build-${CARCH}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
@@ -39,6 +39,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR=${pkgdir} install
 }

mingw-w64-cmdpack/PKGBUILD

@@ -17,17 +17,17 @@ sha256sums=('6ce7029c0f2b0fbc6a1e26fb3ad8003ed18836aa3ef35f148ec51cde0b703307')
 
 prepare() {
   cd "$srcdir"
-  rm -rf build-${CARCH} | true
+  rm -rf build-${MSYSTEM} | true
-  cp -r "${_realname}-$pkgver" "build-${CARCH}"
+  cp -r "${_realname}-$pkgver" "build-${MSYSTEM}"
 }
 
 build() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make
 }
 
 package() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="$pkgdir" prefix=${MINGW_PREFIX} install
   install -D -m644 COPYING "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
 }

mingw-w64-cogl/PKGBUILD

@@ -34,8 +34,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   mkdir doc
   cp -rf ../${_realname}-${pkgver}/doc/* doc/
@@ -56,7 +56,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make -j1 DESTDIR="${pkgdir}" install
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"

mingw-w64-confuse/PKGBUILD

@@ -19,9 +19,9 @@ source=("https://github.com/martinh/libconfuse/releases/download/v${pkgver}/conf
 sha256sums=('1dd50a0320e135a55025b23fcdbb3f0a81913b6d0b0a9df8cc2fdf3b3dc67010')
 
 build() {
-  rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   "../${_realname}-${pkgver}/configure" \
     --prefix="${MINGW_PREFIX}" \
     --build="${MINGW_CHOST}" \
@@ -34,12 +34,12 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make check || true
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 
   # Note that the license also gets installed in share/doc/confuse along with

mingw-w64-cppunit/PKGBUILD

@@ -23,8 +23,8 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
-  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -37,11 +37,11 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make check
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 }

mingw-w64-cpputest/PKGBUILD

@@ -24,8 +24,8 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
-  mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   declare -a extra_config
   if check_option "debug" "n"; then
@@ -48,12 +48,12 @@ build() {
 }
 
 check() {
-  cd ${srcdir}/build-${MINGW_CHOST}
+  cd ${srcdir}/build-${MSYSTEM}
   ${MINGW_PREFIX}/bin/ctest ./ || true
 }
 
 package() {
-  cd ${srcdir}/build-${MINGW_CHOST}
+  cd ${srcdir}/build-${MSYSTEM}
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build ./ --target install
 
   install -Dm644 ${srcdir}/${_realname}-${pkgver}/README.md ${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}/README.md

mingw-w64-cunit/PKGBUILD

@@ -34,10 +34,10 @@ prepare() {
 
 build() {
   cd "${srcdir}"/${_distname}-${_distver}
-  rm -rf "${srcdir}"/build-${CARCH} | true
+  rm -rf "${srcdir}"/build-${MSYSTEM} | true
-  mkdir -p "${srcdir}"/build-${CARCH} 
+  mkdir -p "${srcdir}"/build-${MSYSTEM} 
-  cp -Rf ${srcdir}/${_distname}-${_distver}/* "${srcdir}"/build-${CARCH} 
+  cp -Rf ${srcdir}/${_distname}-${_distver}/* "${srcdir}"/build-${MSYSTEM} 
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
 
   # These checks fail with ucrt: https://github.com/msys2/CLANG-packages/issues/21
   export ac_cv_func_time=yes
@@ -56,10 +56,10 @@ build() {
 }
 
 check() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make install DESTDIR="${pkgdir}"
 }

mingw-w64-d-feet/PKGBUILD

@@ -37,8 +37,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${CARCH}" ]] && rm -rf ${srcdir}/build-${CARCH}
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf ${srcdir}/build-${MSYSTEM}
-  mkdir -p ${srcdir}/build-${CARCH} && cd ${srcdir}/build-${CARCH}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   ${MINGW_PREFIX}/bin/meson \
@@ -52,7 +52,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/ninja install
   install -Dm0644 "${srcdir}/${_realname}-${pkgver}"/COPYING ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING
 

mingw-w64-daala-git/PKGBUILD

@@ -51,9 +51,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   ../${_realname}/configure \
     --build=${MINGW_CHOST} \
     --host=${MINGW_CHOST} \
@@ -68,7 +68,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build-${MINGW_CHOST}
+  cd ${srcdir}/build-${MSYSTEM}
   make DESTDIR=${pkgdir} install
 
   install -Dm644 ${srcdir}/${_realname}/COPYING ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING

mingw-w64-dbus-c++/PKGBUILD

@@ -40,8 +40,8 @@ prepare() {
 build() {
   export LDFLAGS+=" -lexpat -lpthread -lws2_32" # -lpthread needed for i686
   export CPPFLAGS+=" -D_WIN32_WINNT=0x600" # needed to build with winsock2.h
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
   ../${_srcname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -58,6 +58,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make install DESTDIR="${pkgdir}"
 }

mingw-w64-dbus-glib/PKGBUILD

@@ -26,9 +26,9 @@ prepare() {
 }
 
 build() {
-  rm -rf build-${MINGW_CHOST}
+  rm -rf build-${MSYSTEM}
-  mkdir -p build-${MINGW_CHOST}
+  mkdir -p build-${MSYSTEM}
-  cd build-${MINGW_CHOST}
+  cd build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -42,6 +42,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR=${pkgdir} install
 }

mingw-w64-dcraw/PKGBUILD

@@ -27,13 +27,13 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   ${CC} -o ${_realname} -O4 ../${_realname}.c -lm -ljasper -ljpeg -llcms2 -lws2_32
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   install -Dm0755 "${_realname}.exe" "${pkgdir}${MINGW_PREFIX}/bin/${_realname}.exe"
 }

mingw-w64-diffutils/PKGBUILD

@@ -45,9 +45,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -58,7 +58,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build-${MINGW_CHOST}
+  cd ${srcdir}/build-${MSYSTEM}
   make install DESTDIR="${pkgdir}"
 
   # Licenses

mingw-w64-djvulibre/PKGBUILD

@@ -31,9 +31,9 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -45,6 +45,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 }

mingw-w64-dmake/PKGBUILD

@@ -35,7 +35,7 @@ prepare() {
 }
 
 build() {
-  mkdir -p ${srcdir}/build-${CARCH} && cd ${srcdir}/build-${CARCH}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
   ../${_realname}-${pkgver2}/configure \
     --prefix=${MINGW_PREFIX} \
     --host=${MINGW_CHOST} \
@@ -47,6 +47,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 }

mingw-w64-docbook-dsssl/PKGBUILD

@@ -21,13 +21,13 @@ sha256sums=('2f329e120bee9ef42fbdd74ddd60e05e49786c5a7953a0ff4c680ae6bdf0e2bc'
 
 prepare() {
   cd "$srcdir"/ 
-  cp -r "${_realname}-${pkgver}" "build-${CARCH}"
+  cp -r "${_realname}-${pkgver}" "build-${MSYSTEM}"
-  cd "build-${CARCH}"
+  cd "build-${MSYSTEM}"
   cp ${srcdir}/docbook-style-dsssl.Makefile Makefile
 }
 
 package(){
-  cd "$srcdir/build-${CARCH}"
+  cd "$srcdir/build-${MSYSTEM}"
   make install \
      BINDIR="${pkgdir}${MINGW_PREFIX}/bin" \
      DESTDIR="${pkgdir}${MINGW_PREFIX}/share/sgml/docbook/dsssl-stylesheets-${pkgver}" \

mingw-w64-dumb/PKGBUILD

@@ -22,8 +22,8 @@ build() {
   cd "${srcdir}"/${_realname}-${pkgver}
   
   # Shared Build
-  [[ -d "${srcdir}"/build-${CARCH}-shared ]] && rm -rf "${srcdir}"/build-${CARCH}-shared
+  [[ -d "${srcdir}"/build-${MSYSTEM}-shared ]] && rm -rf "${srcdir}"/build-${MSYSTEM}-shared
-  mkdir -p "${srcdir}"/build-${CARCH}-shared && cd "${srcdir}"/build-${CARCH}-shared
+  mkdir -p "${srcdir}"/build-${MSYSTEM}-shared && cd "${srcdir}"/build-${MSYSTEM}-shared
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     ${MINGW_PREFIX}/bin/cmake \
       -G'Ninja' \
@@ -37,8 +37,8 @@ build() {
   ${MINGW_PREFIX}/bin/ninja
   
   # Static Build
-  [[ -d "${srcdir}"/build-${CARCH}-static ]] && rm -rf "${srcdir}"/build-${CARCH}-static
+  [[ -d "${srcdir}"/build-${MSYSTEM}-static ]] && rm -rf "${srcdir}"/build-${MSYSTEM}-static
-  mkdir -p "${srcdir}"/build-${CARCH}-static && cd "${srcdir}"/build-${CARCH}-static
+  mkdir -p "${srcdir}"/build-${MSYSTEM}-static && cd "${srcdir}"/build-${MSYSTEM}-static
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     ${MINGW_PREFIX}/bin/cmake \
       -G'Ninja' \
@@ -54,11 +54,11 @@ build() {
 
 package() {
   # Shared Install
-  cd "${srcdir}"/build-${CARCH}-shared
+  cd "${srcdir}"/build-${MSYSTEM}-shared
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/ninja install
   
   # Static Install
-  cd "${srcdir}"/build-${CARCH}-static
+  cd "${srcdir}"/build-${MSYSTEM}-static
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/ninja install
   
   # License

mingw-w64-enca/PKGBUILD

@@ -28,8 +28,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   CFLAGS+=" -Wno-int-conversion -Wno-implicit-function-declaration"
 
@@ -46,7 +46,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"

mingw-w64-ensmallen/PKGBUILD

@@ -24,8 +24,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${CARCH}" ]] && rm -rf "${srcdir}/build-${CARCH}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${CARCH}" && cd "${srcdir}/build-${CARCH}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   # Tests seek for hdf5 but failed even if avaiable
 
@@ -41,7 +41,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR=${pkgdir} install
 
   pushd "${pkgdir}${MINGW_PREFIX}" > /dev/null

mingw-w64-faac/PKGBUILD

@@ -25,9 +25,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
-  cp -R "${_realname}-${pkgver//\./_}" "${srcdir}"/build-${CARCH}
+  cp -R "${_realname}-${pkgver//\./_}" "${srcdir}"/build-${MSYSTEM}
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
 
   ./configure \
     --prefix=${MINGW_PREFIX} \
@@ -41,6 +41,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make install DESTDIR="${pkgdir}"
 }

mingw-w64-fann/PKGBUILD

@@ -22,9 +22,9 @@ prepare() {
 }
 
 build() {
-  rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir "${srcdir}/build-${MINGW_CHOST}"
+  mkdir "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
@@ -36,7 +36,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
   
   install -Dm644 ${srcdir}/${_realname}-${pkgver}/COPYING.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING.txt

mingw-w64-farstream/PKGBUILD

@@ -37,8 +37,8 @@ prepare() {
 }
 
 build() {
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -53,12 +53,12 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make check || true
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 
   rm -f ${pkgdir}${MINGW_PREFIX}/lib/gstreamer*/*.a

mingw-w64-fastjar/PKGBUILD

@@ -20,8 +20,8 @@ sha256sums=('f156abc5de8658f22ee8f08d7a72c88f9409ebd8c7933e9466b0842afeb2f145')
 
 build() {
   cd "${srcdir}"/${_realname}-${pkgver}
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -32,11 +32,11 @@ build() {
 }
 
 check() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make check
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make install DESTDIR="${pkgdir}"
 }

mingw-w64-fcrackzip/PKGBUILD

@@ -16,8 +16,8 @@ sha256sums=('4a58c8cb98177514ba17ee30d28d4927918bf0bdc3c94d260adfee44d2d43850')
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   CFLAGS+=" -Wno-implicit-int"
 
@@ -33,7 +33,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make install DESTDIR="${pkgdir}"
   mv "${pkgdir}${MINGW_PREFIX}/bin/zipinfo.exe" "${pkgdir}${MINGW_PREFIX}/bin/fzipinfo.exe"
 }

mingw-w64-fdk-aac/PKGBUILD

@@ -25,8 +25,8 @@ prepare() {
 
 build() {
   cd "${srcdir}"/${_realname}-${pkgver}
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -39,7 +39,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build-${CARCH}
+  cd ${srcdir}/build-${MSYSTEM}
 
   make DESTDIR=${pkgdir} install
   

mingw-w64-ffms2/PKGBUILD

@@ -27,8 +27,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -42,7 +42,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"

mingw-w64-ftgl/PKGBUILD

@@ -30,9 +30,9 @@ prepare () {
 }
 
 build() {
-  rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir "${srcdir}/build-${MINGW_CHOST}"
+  mkdir "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   ../"${_realname}-${pkgver}"/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -44,7 +44,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make ECHO=echo DESTDIR="${pkgdir}" install
 
   # FS#23283: install missing headers for OpenCascade

mingw-w64-fxc2/PKGBUILD

@@ -29,15 +29,15 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  cp -rf ${_realname} build-${MINGW_CHOST}
+  cp -rf ${_realname} build-${MSYSTEM}
-  cd build-${MINGW_CHOST}
+  cd build-${MSYSTEM}
 
   ${MINGW_PREFIX}/bin/c++ -static fxc2.cpp -o fxc.exe
 }
 
 package() {
-  cd ${srcdir}/build-${MINGW_CHOST}
+  cd ${srcdir}/build-${MSYSTEM}
   mkdir -p ${pkgdir}${MINGW_PREFIX}/bin
   cp fxc.exe ${pkgdir}${MINGW_PREFIX}/bin/
 }

mingw-w64-gdl/PKGBUILD

@@ -28,8 +28,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MINGW_CHOST} ]] && rm -rf "${srcdir}"/build-${MINGW_CHOST}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
-  mkdir "${srcdir}"/build-${MINGW_CHOST}  && cd "${srcdir}"/build-${MINGW_CHOST}
+  mkdir "${srcdir}"/build-${MSYSTEM}  && cd "${srcdir}"/build-${MSYSTEM}
 
   mkdir -p docs/reference/html
   cp -rf ../${_realname}-${pkgver}/docs/reference/html/* docs/reference/html
@@ -46,7 +46,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"

mingw-w64-gegl/PKGBUILD

@@ -24,7 +24,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-gobject-introspection"
              "${MINGW_PACKAGE_PREFIX}-gi-docgen"
              "${MINGW_PACKAGE_PREFIX}-gettext-tools"
-             $([[ ${MSYSTEM_CARCH} == aarch64 ]] || echo "${MINGW_PACKAGE_PREFIX}-luajit")
+             $([[ ${CARCH} == aarch64 ]] || echo "${MINGW_PACKAGE_PREFIX}-luajit")
              "${MINGW_PACKAGE_PREFIX}-vala")
 depends=("${MINGW_PACKAGE_PREFIX}-babl"
          "${MINGW_PACKAGE_PREFIX}-cairo"
@@ -77,7 +77,7 @@ build() {
     -Dsdl1=disabled \
     -Dintrospection=true \
     -Ddocs=false \
-    $([[ ${MSYSTEM_CARCH} == aarch64 ]] && echo "-Dlua=disabled") \
+    $([[ ${CARCH} == aarch64 ]] && echo "-Dlua=disabled") \
     ../${_realname}-${pkgver}
 
   ${MINGW_PREFIX}/bin/meson.exe compile

mingw-w64-geographiclib/PKGBUILD

@@ -21,8 +21,8 @@ source=(https://downloads.sourceforge.net/project/geographiclib/distrib/${_realn
 sha256sums=('5d4145cd16ebf51a2ff97c9244330a340787d131165cfd150e4b2840c0e8ac2b')
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
@@ -38,7 +38,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   make DESTDIR=${pkgdir} install
 

mingw-w64-geoip/PKGBUILD

@@ -25,8 +25,8 @@ prepare(){
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
   ../${_pkgname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -38,6 +38,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make install DESTDIR="${pkgdir}"
 }

mingw-w64-ghc/PKGBUILD

@@ -127,31 +127,31 @@ validpgpkeys=('FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD') # Benjamin Gamari <ben
 prepare() {
   cd "${srcdir}"
 
-  mkdir -p ${CARCH}/host
+  mkdir -p ${MSYSTEM}/host
-  rm -rf ${CARCH}/ghc-${pkgver}
+  rm -rf ${MSYSTEM}/ghc-${pkgver}
   mv {,$CARCH/}ghc-${pkgver}
 
   msg "Extracting binaries: ghc-${pkgver}-${_hsarch}-unknown-mingw32.tar.xz..."
   bsdtar -xf ghc-${pkgver}-${_hsarch}-unknown-mingw32.tar.xz \
-    -C ${CARCH}/host --strip-components 1
+    -C ${MSYSTEM}/host --strip-components 1
 
   for _hook in "${_hooks[@]}"; do
     echo $_hook
     sed -e "s|MINGW_PREFIX|$(basename ${MINGW_PREFIX})|" \
-      ${_hook} > ${CARCH}/${_hook}
+      ${_hook} > ${MSYSTEM}/${_hook}
   done
 
-  export PATH="${srcdir}/${CARCH}/host/bin:$PATH"
+  export PATH="${srcdir}/${MSYSTEM}/host/bin:$PATH"
 
-  cp -v "${srcdir}/build.mk" "${srcdir}/${CARCH}/ghc-${pkgver}/mk/build.mk"
+  cp -v "${srcdir}/build.mk" "${srcdir}/${MSYSTEM}/ghc-${pkgver}/mk/build.mk"
 
-  cd "${srcdir}/${CARCH}/ghc-${pkgver}"
+  cd "${srcdir}/${MSYSTEM}/ghc-${pkgver}"
   patch -Np1 -i "${srcdir}/0002-Switch-to-LLVM-version-7.0.patch"
 }
 
 build() {
-  export PATH="${srcdir}/${CARCH}/host/bin:${PATH}"
+  export PATH="${srcdir}/${MSYSTEM}/host/bin:${PATH}"
-  cd "${srcdir}/${CARCH}/ghc-${pkgver}"
+  cd "${srcdir}/${MSYSTEM}/ghc-${pkgver}"
 
   ./boot
   ./configure \
@@ -167,20 +167,20 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/${CARCH}/ghc-${pkgver}"
+  cd "${srcdir}/${MSYSTEM}/ghc-${pkgver}"
 
   make test
 }
 
 package() {
-  cd "${srcdir}/${CARCH}/ghc-${pkgver}"
+  cd "${srcdir}/${MSYSTEM}/ghc-${pkgver}"
 
   make prefix="${pkgdir}${MINGW_PREFIX}" \
     docdir="${pkgdir}${MINGW_PREFIX}/share/docs/ghc" \
     install
 
   for _hook in "${_hooks[@]}"; do
-    install -Dm644 "${srcdir}/${CARCH}/${_hook}" \
+    install -Dm644 "${srcdir}/${MSYSTEM}/${_hook}" \
       "${pkgdir}/usr/share/libalpm/hooks/${MINGW_PACKAGE_PREFIX}-${_hook}"
   done
 

mingw-w64-gl2ps/PKGBUILD

@@ -28,9 +28,9 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir build-${MINGW_CHOST}
+  mkdir build-${MSYSTEM}
-  cd build-${MINGW_CHOST}
+  cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
@@ -43,7 +43,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install .
   install -Dm644 ${srcdir}/${_realname}-${pkgver}/COPYING.LGPL   ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING.LGPL
   install -Dm644 ${srcdir}/${_realname}-${pkgver}/COPYING.GL2PS  ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING.GL2PS

mingw-w64-glade/PKGBUILD

@@ -38,8 +38,8 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
-  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   meson \
@@ -57,7 +57,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   DESTDIR="${pkgdir}" ninja install
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"

mingw-w64-gperf/PKGBUILD

@@ -28,8 +28,8 @@ prepare() {
 }
 
 build() {
-  mkdir ${srcdir}/build-${MINGW_CHOST}
+  mkdir ${srcdir}/build-${MSYSTEM}
-  cd "${srcdir}"/build-${MINGW_CHOST}
+  cd "${srcdir}"/build-${MSYSTEM}
   ../${_realname}-${pkgver}/configure \
     --build=${MINGW_CHOST} \
     --host=${MINGW_CHOST} \
@@ -39,12 +39,12 @@ build() {
 }
 
 check() {
-  cd "${srcdir}"/build-${MINGW_CHOST}
+  cd "${srcdir}"/build-${MSYSTEM}
   make check
 }
 
 package() {
-  cd "${srcdir}"/build-${MINGW_CHOST}
+  cd "${srcdir}"/build-${MSYSTEM}
   make DESTDIR="${pkgdir}" install
   rm -rf ${pkgdir}${MINGW_PREFIX}/share
 }

mingw-w64-graphene/PKGBUILD

@@ -21,8 +21,8 @@ source=("${_realname}-${pkgver}.tar.gz::https://github.com/ebassi/graphene/archi
 sha256sums=('922dc109d2dc5dc56617a29bd716c79dd84db31721a8493a13a5f79109a4a4ed')
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   meson \
@@ -36,12 +36,12 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   meson test --print-errorlogs || true
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   DESTDIR="${pkgdir}" meson install
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE.txt"

mingw-w64-graphite2/PKGBUILD

@@ -58,7 +58,7 @@ prepare() {
 }
 
 check() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   # we also want to use mingw-w64-x86_64 and mingw-w64-i686 versions of python
   mkdir -p "${srcdir}"/${_realname}-${pkgver}/tests/backup
   cp "${srcdir}"/${_realname}-${pkgver}/tests/{corrupt.py,defuzz,fnttxtrender,hbspeeds,jsoncmp,trace2svg} \
@@ -72,8 +72,8 @@ check() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   declare -a extra_config
   if check_option "debug" "n"; then
@@ -98,7 +98,7 @@ build() {
 
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make DESTDIR=${pkgdir} install
 
   # License

mingw-w64-gsm/PKGBUILD

@@ -32,13 +32,13 @@ prepare() {
 }
 
 build() {
-  cp -r ${srcdir}/${_realname}-${pkgver%.*}-pl${pkgver##*.} ${srcdir}/build-${MINGW_CHOST}
+  cp -r ${srcdir}/${_realname}-${pkgver%.*}-pl${pkgver##*.} ${srcdir}/build-${MSYSTEM}
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   # Prepare directories
   install -m755 -d "${pkgdir}${MINGW_PREFIX}"/{bin,lib,include,share/{licenses/${_realname},man/man{1,3}}}

mingw-w64-gss/PKGBUILD

@@ -42,9 +42,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p build-${MINGW_CHOST}
+  mkdir -p build-${MSYSTEM}
-  cd build-${MINGW_CHOST}
+  cd build-${MSYSTEM}
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -57,6 +57,6 @@ build() {
 }
 
 package() {
-  cd build-${MINGW_CHOST}
+  cd build-${MSYSTEM}
   make DESTDIR="${pkgdir}" install
 }

mingw-w64-gtk-doc/PKGBUILD

@@ -35,8 +35,8 @@ prepare() {
 }
 
 build() {
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   meson \
@@ -51,7 +51,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   DESTDIR="${pkgdir}" meson install
 
   # Make relocatable (hacky... :/)

mingw-w64-gtk-engine-murrine/PKGBUILD

@@ -23,8 +23,8 @@ prepare() {
   autoreconf -fiv
 }
 build() {
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   ../murrine-${pkgver}/configure --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -35,6 +35,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 }

mingw-w64-gtk-engines/PKGBUILD

@@ -28,8 +28,8 @@ prepare() {
 }
 
 build() {
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -40,6 +40,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 }

mingw-w64-gtk2/PKGBUILD

@@ -86,8 +86,8 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
-  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   ../gtk+-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -108,7 +108,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make -j1 DESTDIR="${pkgdir}" install
 
   # Provided by a gtk3/4 split package instead

mingw-w64-gtkglarea/PKGBUILD

@@ -32,8 +32,8 @@ prepare() {
 }
 
 build() {
-  cp -r "${srcdir}/gtkglarea-${pkgver}" "${srcdir}/build-${MINGW_CHOST}"
+  cp -r "${srcdir}/gtkglarea-${pkgver}" "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   ./configure \
     --prefix="${MINGW_PREFIX}" \
@@ -45,7 +45,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   mkdir -p "${pkgdir}${MINGW_PREFIX}/lib"
   make DESTDIR="${pkgdir}" install

mingw-w64-gtkglext/PKGBUILD

@@ -30,9 +30,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  cp -r "${srcdir}/gtkglext-${pkgver}" "${srcdir}/build-${MINGW_CHOST}"
+  cp -r "${srcdir}/gtkglext-${pkgver}" "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   CFLAGS+=" -fcommon"  # work around gcc 10 being stricter here
 
@@ -53,7 +53,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
   find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm
 }

mingw-w64-gtkmm/PKGBUILD

@@ -27,8 +27,8 @@ prepare() {
 
 build() {
   CPPFLAGS+=" -D_REENTRANT"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -40,7 +40,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
   find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"

mingw-w64-gtksourceview3/PKGBUILD

@@ -33,8 +33,8 @@ prepare() {
 }
 
 build() {
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   mkdir -p docs/reference/html
   cp -rf ../${_realname}-${pkgver}/docs/reference/html/* docs/reference/html
@@ -55,7 +55,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make -j1 DESTDIR="${pkgdir}" install
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"

mingw-w64-gtksourceviewmm3/PKGBUILD

@@ -32,8 +32,8 @@ prepare() {
 build() {
   CPPFLAGS+=" -D_REENTRANT"
   export lt_cv_deplibs_check_method='pass_all'
-  [[ -d "${srcdir}"/build-${MINGW_CHOST} ]] && rm -rf "${srcdir}"/build-${MINGW_CHOST}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -46,7 +46,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
   find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}3/COPYING"

mingw-w64-gts/PKGBUILD

@@ -24,9 +24,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
-  cp -rf "${srcdir}"/${_realname}-${pkgver}/. "${srcdir}"/build-${CARCH}
+  cp -rf "${srcdir}"/${_realname}-${pkgver}/. "${srcdir}"/build-${MSYSTEM}
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   
   export LDFLAGS=${LDFLAGS//--as-needed,}
   ./configure \
@@ -41,7 +41,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make install DESTDIR="${pkgdir}"
   
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})

mingw-w64-gxml/PKGBUILD

@@ -32,9 +32,9 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
-  mkdir -p build-${MINGW_CHOST}
+  mkdir -p build-${MSYSTEM}
-  cd build-${MINGW_CHOST}
+  cd build-${MSYSTEM}
 
   # clang error from vala generated file
   export CFLAGS="${CFLAGS} -Wno-incompatible-function-pointer-types"
@@ -49,7 +49,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   DESTDIR="${pkgdir}" ninja install
 
   for pcfile in  "${pkgdir}${MINGW_PREFIX}"/lib/pkgconfig/*.pc; do

mingw-w64-hlsl2glsl-git/PKGBUILD

@@ -42,8 +42,8 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${CARCH} ]] && rm -rf build-${CARCH}
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir build-${CARCH} && cd build-${CARCH}
+  mkdir build-${MSYSTEM} && cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX" \
     ${MINGW_PREFIX}/bin/cmake \
@@ -55,6 +55,6 @@ build() {
 }
 
 package() {
-  cd build-${CARCH}
+  cd build-${MSYSTEM}
   make install DESTDIR=${pkgdir}
 }

mingw-w64-http-parser/PKGBUILD

@@ -24,9 +24,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
-  cp -R ${srcdir}/${_realname}-${pkgver}/. "${srcdir}"/build-${CARCH}
+  cp -R ${srcdir}/${_realname}-${pkgver}/. "${srcdir}"/build-${MSYSTEM}
 
   AR=${MINGW_PREFIX}/bin/ar \
   SONAME=libhttp_parser-2.dll \
@@ -37,12 +37,12 @@ build() {
 }
 
 check() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make test || true
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   mkdir -p ${pkgdir}${MINGW_PREFIX}/{bin,include,lib}
   install -Dm644 http_parser.h "${pkgdir}${MINGW_PREFIX}/include/http_parser.h"
   cp *.a ${pkgdir}${MINGW_PREFIX}/lib/

mingw-w64-hunspell/PKGBUILD

@@ -59,9 +59,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   #CPPFLAGS+=" -I${MINGW_PREFIX}/include/ncurses"
   #CFLAGS+=" -I${MINGW_PREFIX}/include/ncurses"
@@ -81,12 +81,12 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make check
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="-DBINDIR=;-DDATA_DIR=" \
   make DESTDIR="${pkgdir}" install
   cp ${pkgdir}${MINGW_PREFIX}/lib/lib${_realname}-${pkgver%.*}.dll.a ${pkgdir}${MINGW_PREFIX}/lib/lib${_realname}.dll.a

mingw-w64-hyphen/PKGBUILD

@@ -40,10 +40,10 @@ prepare() {
 
 build() {
   cd "$srcdir"/${_realname}-${pkgver}
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   #Note you have to copy the files for the tests and install to work.
-  cp -a "${srcdir}/${_realname}-${pkgver}" "${srcdir}/build-${CARCH}" && \
+  cp -a "${srcdir}/${_realname}-${pkgver}" "${srcdir}/build-${MSYSTEM}" && \
-    cd "${srcdir}"/build-${CARCH}
+    cd "${srcdir}"/build-${MSYSTEM}
 
    ./configure \
     --prefix=${MINGW_PREFIX} \
@@ -57,7 +57,7 @@ build() {
 }
 
 check() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make check
 }
 
@@ -65,7 +65,7 @@ package_hyphen() {
   pkgdesc="library for high quality hyphenation and justification (mingw-w64)"
   optdepends=("perl: for substrings.pl")
 
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make DESTDIR="${pkgdir}/" install-libLTLIBRARIES
   make DESTDIR="${pkgdir}/" install-binSCRIPTS
   make DESTDIR="${pkgdir}/" install-includeHEADERS
@@ -79,7 +79,7 @@ package_hyphen-en() {
 pkgdesc="English hyphenation rules"
 optdepends=("${MINGW_PACKAGE_PREFIX}-hyphen: offers hyphenation library functions")
 
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make DESTDIR="${pkgdir}/" install-hyphDATA
 
 #The rest of this is done to be consistant with ArchLinux's

mingw-w64-indent/PKGBUILD

@@ -68,8 +68,8 @@ prepare() {
 
 build() {
   CFLAGS+=" -Wno-error=nested-externs"
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
-  cp -rf ${_realname}-${pkgver} "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  cp -rf ${_realname}-${pkgver} "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
   ./configure \
     --prefix=${MINGW_PREFIX} \
     --{host,build}=${MINGW_CHOST}
@@ -83,6 +83,6 @@ check() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make DESTDIR="${pkgdir}" install
 }

mingw-w64-jbig2dec/PKGBUILD

@@ -36,8 +36,8 @@ prepare() {
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   export lt_cv_deplibs_check_method='pass_all'
   ../${_realname}-${pkgver}/configure \
@@ -52,7 +52,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
   install -Dm644 ${srcdir}/${_realname}-${pkgver}/COPYING ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING
   install -Dm644 ${srcdir}/${_realname}-${pkgver}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE

mingw-w64-jxrlib/PKGBUILD

@@ -47,8 +47,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${CARCH}" ]] && rm -rf "${srcdir}/build-${CARCH}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${CARCH}" && cd "${srcdir}/build-${CARCH}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
  
   declare -a extra_config
   if check_option "debug" "n"; then
@@ -68,6 +68,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 }

mingw-w64-l-smash/PKGBUILD

@@ -27,9 +27,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  mkdir -p ${srcdir}/build-${MINGW_CHOST}
+  mkdir -p ${srcdir}/build-${MSYSTEM}
-  cd ${srcdir}/build-${MINGW_CHOST}
+  cd ${srcdir}/build-${MSYSTEM}
   #On clang this isn't properly detected
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -40,7 +40,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build-${MINGW_CHOST}
+  cd ${srcdir}/build-${MSYSTEM}
   make SLIB_CMD="" DESTDIR=${pkgdir} install
 
   install -Dm644 ${srcdir}/${_realname}-${pkgver}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE

mingw-w64-lame/PKGBUILD

@@ -54,9 +54,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -71,6 +71,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 }

mingw-w64-lcms/PKGBUILD

@@ -42,9 +42,9 @@ prepare(){
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  cp -rf ${srcdir}/${_realname}-${pkgver} "${srcdir}/build-${MINGW_CHOST}"
+  cp -rf ${srcdir}/${_realname}-${pkgver} "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   ./configure \
     --build=${MINGW_CHOST} \
@@ -57,6 +57,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 }

mingw-w64-libaacs/PKGBUILD

@@ -22,8 +22,8 @@ prepare() {
 
 build() {
   cd "$srcdir"/${_realname}-${pkgver}
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   # Do not add --host and --target options, otherwise
   # executables are installed with target triplet prefixes
@@ -37,7 +37,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make install DESTDIR="${pkgdir}"
   install -Dm644 "$srcdir"/${_realname}-${pkgver}/COPYING "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}"/COPYING
   install -Dm644 "$srcdir"/${_realname}-${pkgver}/KEYDB.cfg "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}"/KEYDB.cfg

mingw-w64-libao/PKGBUILD

@@ -24,8 +24,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   LIBS+="-lksuser" \
   ../${_realname}-${pkgver}/configure \
@@ -42,7 +42,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   DESTDIR="${pkgdir}" make install
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"

mingw-w64-libart_lgpl/PKGBUILD

@@ -29,8 +29,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
   ../${_realname}-${pkgver}/configure \
      --prefix=${MINGW_PREFIX} \
      --exec-prefix=${MINGW_PREFIX} \
@@ -50,7 +50,7 @@ check() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make install DESTDIR="${pkgdir}"
 
   cd "${srcdir}"/${_realname}-${pkgver}

mingw-w64-libbdplus/PKGBUILD

@@ -17,8 +17,8 @@ sha256sums=('b93eea3eaef33d6e9155d2c34b068c505493aa5a4936e63274f4342ab0f40a58')
 
 build() {
   cd "$srcdir"/${_realname}-${pkgver}
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -31,7 +31,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make install DESTDIR="${pkgdir}"
   install -Dm644 "$srcdir"/${_realname}-${pkgver}/COPYING "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}"/COPYING
   install -Dm644 "$srcdir"/${_realname}-${pkgver}/README.md "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}"/README.md

mingw-w64-libbs2b/PKGBUILD

@@ -25,8 +25,8 @@ prepare() {
 
 build() {
   cd "$srcdir"/${_realname}-${pkgver}
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -40,6 +40,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make install DESTDIR="${pkgdir}"
 }

mingw-w64-libcaca/PKGBUILD

@@ -44,8 +44,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   # wrong result with ucrt
   export ac_cv_func_sprintf_s=yes
@@ -66,7 +66,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make -j1 DESTDIR="${pkgdir}" install
   find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm
 

mingw-w64-libcddb/PKGBUILD

@@ -48,8 +48,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -62,6 +62,6 @@ build() {
 }
 
 package() {
-  cd build-${MINGW_CHOST}
+  cd build-${MSYSTEM}
   make DESTDIR="${pkgdir}" install
 }

mingw-w64-libcdio-paranoia/PKGBUILD

@@ -30,7 +30,7 @@ prepare() {
 }
 
 build() {
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -47,6 +47,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make -j1 DESTDIR="${pkgdir}" install
 }

mingw-w64-libcdio/PKGBUILD

@@ -32,7 +32,7 @@ prepare() {
 }
 
 build() {
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -48,7 +48,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make -j1 DESTDIR="${pkgdir}" install
 
   sed -i "/LIBCDIO_SOURCE_PATH/s|.*|/* #undef LIBCDIO_SOURCE_PATH */|" \

mingw-w64-libconfini/PKGBUILD

@@ -23,8 +23,8 @@ prepare() {
 }
 
 build() {
-  [ -d "${srcdir}/build-${MINGW_CHOST}" ] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  [ -d "${srcdir}/build-${MSYSTEM}" ] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
   ../${_realname}-${pkgver}/configure \
       --prefix="${MINGW_PREFIX}" \
       --build="${MINGW_CHOST}" \
@@ -35,11 +35,11 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make check
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 }

mingw-w64-libcue/PKGBUILD

@@ -17,8 +17,8 @@ sha256sums=('cc1b3a65c60bd88b77a1ddd1574042d83cf7cc32b85fe9481c99613359eb7cfe')
 
 build() {
   echo "Building static library"
-  [[ -d ${srcdir}/build-${CARCH}-static ]] && rm -rf ${srcdir}/build-${CARCH}-static
+  [[ -d ${srcdir}/build-${MSYSTEM}-static ]] && rm -rf ${srcdir}/build-${MSYSTEM}-static
-  mkdir -p "${srcdir}/build-${CARCH}-static" && cd "${srcdir}/build-${CARCH}-static"
+  mkdir -p "${srcdir}/build-${MSYSTEM}-static" && cd "${srcdir}/build-${MSYSTEM}-static"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     ${MINGW_PREFIX}/bin/cmake \
@@ -31,8 +31,8 @@ build() {
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
 
   echo "Building shared library"
-  [[ -d "${srcdir}"/build-${CARCH}-shared ]] && rm -rf "${srcdir}"/build-${CARCH}-shared
+  [[ -d "${srcdir}"/build-${MSYSTEM}-shared ]] && rm -rf "${srcdir}"/build-${MSYSTEM}-shared
-  mkdir -p "${srcdir}"/build-${CARCH}-shared && cd "${srcdir}"/build-${CARCH}-shared
+  mkdir -p "${srcdir}"/build-${MSYSTEM}-shared && cd "${srcdir}"/build-${MSYSTEM}-shared
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     ${MINGW_PREFIX}/bin/cmake \
@@ -46,10 +46,10 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${CARCH}-static"
+  cd "${srcdir}/build-${MSYSTEM}-static"
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
 
-  cd "${srcdir}"/build-${CARCH}-shared
+  cd "${srcdir}"/build-${MSYSTEM}-shared
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"

mingw-w64-libdca/PKGBUILD

@@ -30,8 +30,8 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
-  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -45,7 +45,7 @@ build() {
 }
 
 package() {
-  cd build-${MINGW_CHOST}
+  cd build-${MSYSTEM}
   make DESTDIR="${pkgdir}" install
 
   rm -f "${pkgdir}${MINGW_PREFIX}/share/man/man1"/{extract_dts,dtsdec}.1

mingw-w64-libdvbpsi/PKGBUILD

@@ -16,8 +16,8 @@ source=("https://download.videolan.org/pub/${_realname}/${pkgver}/${_realname}-$
 sha256sums=('02b5998bcf289cdfbd8757bedd5987e681309b0a25b3ffe6cebae599f7a00112')
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -28,7 +28,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   mkdir -p ${pkgdir}${MINGW_PREFIX}/{bin,lib,include}
   make -j1 SUBDIRS=src DESTDIR="${pkgdir}" install
 }

mingw-w64-libdvdcss/PKGBUILD

@@ -23,9 +23,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -37,6 +37,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 }

mingw-w64-libdvdnav/PKGBUILD

@@ -26,9 +26,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -39,6 +39,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 }

mingw-w64-libebur128/PKGBUILD

@@ -25,8 +25,8 @@ prepare() {
 }
 
 build() {
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
@@ -39,7 +39,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build . --target install
 }

mingw-w64-libelf/PKGBUILD

@@ -15,8 +15,8 @@ source=("https://fossies.org/linux/misc/old/${_realname}-${pkgver}.tar.gz")
 sha256sums=('591a9b4ec81c1f2042a97aa60564e0cb79d041c52faa7416acb38bc95bd2c76d')
 
 build() {
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH} 
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM} 
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH} 
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM} 
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --host=${MINGW_CHOST} \
@@ -27,6 +27,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make install instroot="${pkgdir}"
 }

mingw-w64-libffi/PKGBUILD

@@ -20,7 +20,7 @@ source=("https://github.com/libffi/libffi/releases/download/v$pkgver/libffi-$pkg
 sha256sums=('b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e')
 
 build() {
-  mkdir -p ${srcdir}/build-${CARCH} && cd ${srcdir}/build-${CARCH}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -32,7 +32,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"

mingw-w64-libftdi/PKGBUILD

@@ -47,9 +47,9 @@ prepare() {
 }
 
 build() {
-  rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
     -G"MSYS Makefiles" \
@@ -65,12 +65,12 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
-  PATH=$PATH:"${srcdir}/build-${MINGW_CHOST}/src" make check || true
+  PATH=$PATH:"${srcdir}/build-${MSYSTEM}/src" make check || true
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 
   cd "${srcdir}/${_realname}1-${pkgver}"