diff --git a/mingw-w64-4th/PKGBUILD b/mingw-w64-4th/PKGBUILD
index 918b0168ee..1b5994e979 100644
--- a/mingw-w64-4th/PKGBUILD
+++ b/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}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
-  cp -R ${srcdir}/${_realname}-${pkgver}/sources/. "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
+  cp -R ${srcdir}/${_realname}-${pkgver}/sources/. "${srcdir}"/build-${MSYSTEM}
   CROSS="${MINGW_PREFIX}/bin/" \
   make -f Makefile.W32 CC="$CC"
 }
diff --git a/mingw-w64-SDL/PKGBUILD b/mingw-w64-SDL/PKGBUILD
index cfc3056bd0..6cbb0a3df0 100644
--- a/mingw-w64-SDL/PKGBUILD
+++ b/mingw-w64-SDL/PKGBUILD
@@ -34,9 +34,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  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
 }
diff --git a/mingw-w64-SDL2_gfx/PKGBUILD b/mingw-w64-SDL2_gfx/PKGBUILD
index 7d5ed61806..e8a112063b 100644
--- a/mingw-w64-SDL2_gfx/PKGBUILD
+++ b/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}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  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"
 }
diff --git a/mingw-w64-SDL_gfx/PKGBUILD b/mingw-w64-SDL_gfx/PKGBUILD
index b297aec963..e8d0b24845 100644
--- a/mingw-w64-SDL_gfx/PKGBUILD
+++ b/mingw-w64-SDL_gfx/PKGBUILD
@@ -21,9 +21,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  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" \
diff --git a/mingw-w64-SDL_image/PKGBUILD b/mingw-w64-SDL_image/PKGBUILD
index d10e4085e7..c138d7222f 100644
--- a/mingw-w64-SDL_image/PKGBUILD
+++ b/mingw-w64-SDL_image/PKGBUILD
@@ -34,9 +34,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  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" \
diff --git a/mingw-w64-SDL_mixer/PKGBUILD b/mingw-w64-SDL_mixer/PKGBUILD
index 8c6150641a..9d32564a48 100644
--- a/mingw-w64-SDL_mixer/PKGBUILD
+++ b/mingw-w64-SDL_mixer/PKGBUILD
@@ -63,9 +63,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  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" \
diff --git a/mingw-w64-SDL_net/PKGBUILD b/mingw-w64-SDL_net/PKGBUILD
index c0957c3c37..47f27327e6 100644
--- a/mingw-w64-SDL_net/PKGBUILD
+++ b/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}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  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" \
diff --git a/mingw-w64-SDL_ttf/PKGBUILD b/mingw-w64-SDL_ttf/PKGBUILD
index 5df3932487..473e5f5893 100644
--- a/mingw-w64-SDL_ttf/PKGBUILD
+++ b/mingw-w64-SDL_ttf/PKGBUILD
@@ -38,8 +38,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  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"
 }
diff --git a/mingw-w64-a52dec/PKGBUILD b/mingw-w64-a52dec/PKGBUILD
index b7deb6a532..1309cbe293 100644
--- a/mingw-w64-a52dec/PKGBUILD
+++ b/mingw-w64-a52dec/PKGBUILD
@@ -30,8 +30,8 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
-  mkdir build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
+  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/"
 }
diff --git a/mingw-w64-akira/PKGBUILD b/mingw-w64-akira/PKGBUILD
index 5a43f4c392..0871667e91 100644
--- a/mingw-w64-akira/PKGBUILD
+++ b/mingw-w64-akira/PKGBUILD
@@ -32,9 +32,9 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
-  mkdir -p build-${MINGW_CHOST}
-  cd build-${MINGW_CHOST}
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM}
+  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"
diff --git a/mingw-w64-alure/PKGBUILD b/mingw-w64-alure/PKGBUILD
index 7cd46f9084..c0bf8c5df7 100644
--- a/mingw-w64-alure/PKGBUILD
+++ b/mingw-w64-alure/PKGBUILD
@@ -40,9 +40,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  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 ./
 
diff --git a/mingw-w64-alure2/PKGBUILD b/mingw-w64-alure2/PKGBUILD
index 7ce7366e7c..05d1215e4b 100644
--- a/mingw-w64-alure2/PKGBUILD
+++ b/mingw-w64-alure2/PKGBUILD
@@ -36,9 +36,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  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
 
diff --git a/mingw-w64-apr/PKGBUILD b/mingw-w64-apr/PKGBUILD
index 0aaf175dfb..69bbee977e 100644
--- a/mingw-w64-apr/PKGBUILD
+++ b/mingw-w64-apr/PKGBUILD
@@ -79,7 +79,7 @@ build() {
 }
 
 #check() {
-#  cd "${srcdir}/build-${MINGW_CHOST}"
+#  cd "${srcdir}/build-${MSYSTEM}"
 #  make -j1 check
 #}
 
diff --git a/mingw-w64-argon2/PKGBUILD b/mingw-w64-argon2/PKGBUILD
index 6ab856a72e..2495fd13ed 100644
--- a/mingw-w64-argon2/PKGBUILD
+++ b/mingw-w64-argon2/PKGBUILD
@@ -45,15 +45,15 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
-  cp -rf ${srcdir}/phc-winner-argon2-${pkgver} "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
+  cp -rf ${srcdir}/phc-winner-argon2-${pkgver} "${srcdir}/build-${MSYSTEM}"
+  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"
diff --git a/mingw-w64-argtable/PKGBUILD b/mingw-w64-argtable/PKGBUILD
index 4dbe92b18e..21104cface 100644
--- a/mingw-w64-argtable/PKGBUILD
+++ b/mingw-w64-argtable/PKGBUILD
@@ -30,8 +30,8 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  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
 }
diff --git a/mingw-w64-aribb24/PKGBUILD b/mingw-w64-aribb24/PKGBUILD
index c8260c92c3..07a09c4091 100644
--- a/mingw-w64-aribb24/PKGBUILD
+++ b/mingw-w64-aribb24/PKGBUILD
@@ -25,8 +25,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  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
 }
diff --git a/mingw-w64-bin2header/PKGBUILD b/mingw-w64-bin2header/PKGBUILD
index f919b77f47..d4b0b520b5 100644
--- a/mingw-w64-bin2header/PKGBUILD
+++ b/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}
-  mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  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
 }
diff --git a/mingw-w64-breakpad-git/PKGBUILD b/mingw-w64-breakpad-git/PKGBUILD
index f2112f31e1..97bbeb48b0 100644
--- a/mingw-w64-breakpad-git/PKGBUILD
+++ b/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.${CARCH}/src/common/scoped_ptr.h common/
+    cp -v ${srcdir}/${_realname}.build.${MSYSTEM}/src/google_breakpad/common/* 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.${CARCH}/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.${CARCH}/src/client/windows/crash_generation/minidump_generator.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.${MSYSTEM}/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_server.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.${CARCH}/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.${CARCH}/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/crash_generation/libcrash_generation_client.a
+ADDLIB ${_windir}/${_realname}.build.${MSYSTEM}/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/handler/libexception_handler.a
+ADDLIB ${_windir}/${_realname}.build.${MSYSTEM}/src/out/Debug/obj.target/client/windows/libcommon.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.${CARCH}/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.${CARCH}/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.${CARCH}/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.${CARCH}/src/client/windows/tests/crash_generation_app/small.ico .
+    cp -v ${srcdir}/${_realname}.build.${MSYSTEM}/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.h .
+    cp -v ${srcdir}/${_realname}.build.${MSYSTEM}/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.h .
+    cp -v ${srcdir}/${_realname}.build.${MSYSTEM}/src/client/windows/tests/crash_generation_app/crash_generation_app.ico .
+    cp -v ${srcdir}/${_realname}.build.${MSYSTEM}/src/client/windows/tests/crash_generation_app/resource.h .
+    cp -v ${srcdir}/${_realname}.build.${MSYSTEM}/src/client/windows/tests/crash_generation_app/resource.rc .
+    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/*
diff --git a/mingw-w64-bzip2/PKGBUILD b/mingw-w64-bzip2/PKGBUILD
index 24642c72d6..b7bbd87ad5 100644
--- a/mingw-w64-bzip2/PKGBUILD
+++ b/mingw-w64-bzip2/PKGBUILD
@@ -43,8 +43,8 @@ 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} \
@@ -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"
diff --git a/mingw-w64-cantarell-fonts/PKGBUILD b/mingw-w64-cantarell-fonts/PKGBUILD
index 83c8668033..3f78496a1e 100644
--- a/mingw-w64-cantarell-fonts/PKGBUILD
+++ b/mingw-w64-cantarell-fonts/PKGBUILD
@@ -22,10 +22,10 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
-  mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
+  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
 
diff --git a/mingw-w64-chipmunk/PKGBUILD b/mingw-w64-chipmunk/PKGBUILD
index 22668f38f7..702a15f6d1 100644
--- a/mingw-w64-chipmunk/PKGBUILD
+++ b/mingw-w64-chipmunk/PKGBUILD
@@ -22,8 +22,8 @@ prepare() {
 
 build() {
 
-  mkdir -p "${srcdir}/build-${CARCH}"
-  cd "${srcdir}/build-${CARCH}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  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
 }
diff --git a/mingw-w64-cmdpack/PKGBUILD b/mingw-w64-cmdpack/PKGBUILD
index a5a75c313f..b217efbf43 100644
--- a/mingw-w64-cmdpack/PKGBUILD
+++ b/mingw-w64-cmdpack/PKGBUILD
@@ -17,17 +17,17 @@ sha256sums=('6ce7029c0f2b0fbc6a1e26fb3ad8003ed18836aa3ef35f148ec51cde0b703307')
 
 prepare() {
   cd "$srcdir"
-  rm -rf build-${CARCH} | true
-  cp -r "${_realname}-$pkgver" "build-${CARCH}"
+  rm -rf build-${MSYSTEM} | true
+  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"
 }
diff --git a/mingw-w64-cogl/PKGBUILD b/mingw-w64-cogl/PKGBUILD
index cf02bb224f..595a7491f6 100644
--- a/mingw-w64-cogl/PKGBUILD
+++ b/mingw-w64-cogl/PKGBUILD
@@ -34,8 +34,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  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"
diff --git a/mingw-w64-confuse/PKGBUILD b/mingw-w64-confuse/PKGBUILD
index 53f43821ac..a480b8c819 100644
--- a/mingw-w64-confuse/PKGBUILD
+++ b/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}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  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
diff --git a/mingw-w64-cppunit/PKGBUILD b/mingw-w64-cppunit/PKGBUILD
index 3b27273f4b..aeda9d328f 100644
--- a/mingw-w64-cppunit/PKGBUILD
+++ b/mingw-w64-cppunit/PKGBUILD
@@ -23,8 +23,8 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  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
 }
diff --git a/mingw-w64-cpputest/PKGBUILD b/mingw-w64-cpputest/PKGBUILD
index 75811b36c9..21c27d317f 100644
--- a/mingw-w64-cpputest/PKGBUILD
+++ b/mingw-w64-cpputest/PKGBUILD
@@ -24,8 +24,8 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  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
diff --git a/mingw-w64-cunit/PKGBUILD b/mingw-w64-cunit/PKGBUILD
index 21e1be9709..6b57043344 100644
--- a/mingw-w64-cunit/PKGBUILD
+++ b/mingw-w64-cunit/PKGBUILD
@@ -34,10 +34,10 @@ prepare() {
 
 build() {
   cd "${srcdir}"/${_distname}-${_distver}
-  rm -rf "${srcdir}"/build-${CARCH} | true
-  mkdir -p "${srcdir}"/build-${CARCH} 
-  cp -Rf ${srcdir}/${_distname}-${_distver}/* "${srcdir}"/build-${CARCH} 
-  cd "${srcdir}"/build-${CARCH}
+  rm -rf "${srcdir}"/build-${MSYSTEM} | true
+  mkdir -p "${srcdir}"/build-${MSYSTEM} 
+  cp -Rf ${srcdir}/${_distname}-${_distver}/* "${srcdir}"/build-${MSYSTEM} 
+  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}"
 }
diff --git a/mingw-w64-d-feet/PKGBUILD b/mingw-w64-d-feet/PKGBUILD
index b32ffb2f67..f3380c128a 100644
--- a/mingw-w64-d-feet/PKGBUILD
+++ b/mingw-w64-d-feet/PKGBUILD
@@ -37,8 +37,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${CARCH}" ]] && rm -rf ${srcdir}/build-${CARCH}
-  mkdir -p ${srcdir}/build-${CARCH} && cd ${srcdir}/build-${CARCH}
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  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
 
diff --git a/mingw-w64-daala-git/PKGBUILD b/mingw-w64-daala-git/PKGBUILD
index 5061ae3749..43c3080e0a 100644
--- a/mingw-w64-daala-git/PKGBUILD
+++ b/mingw-w64-daala-git/PKGBUILD
@@ -51,9 +51,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  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
diff --git a/mingw-w64-dbus-c++/PKGBUILD b/mingw-w64-dbus-c++/PKGBUILD
index bb5fbfe02d..83f332b69b 100644
--- a/mingw-w64-dbus-c++/PKGBUILD
+++ b/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}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  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}"
 }
diff --git a/mingw-w64-dbus-glib/PKGBUILD b/mingw-w64-dbus-glib/PKGBUILD
index e65b17e5be..3a08d22ca7 100644
--- a/mingw-w64-dbus-glib/PKGBUILD
+++ b/mingw-w64-dbus-glib/PKGBUILD
@@ -26,9 +26,9 @@ prepare() {
 }
 
 build() {
-  rm -rf build-${MINGW_CHOST}
-  mkdir -p build-${MINGW_CHOST}
-  cd build-${MINGW_CHOST}
+  rm -rf build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM}
+  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
 }
diff --git a/mingw-w64-dcraw/PKGBUILD b/mingw-w64-dcraw/PKGBUILD
index 614f7392c4..29bc79866a 100644
--- a/mingw-w64-dcraw/PKGBUILD
+++ b/mingw-w64-dcraw/PKGBUILD
@@ -27,13 +27,13 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
-  mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
+  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"
 }
diff --git a/mingw-w64-diffutils/PKGBUILD b/mingw-w64-diffutils/PKGBUILD
index ff81e13a4e..79ce1a651b 100644
--- a/mingw-w64-diffutils/PKGBUILD
+++ b/mingw-w64-diffutils/PKGBUILD
@@ -45,9 +45,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  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
diff --git a/mingw-w64-djvulibre/PKGBUILD b/mingw-w64-djvulibre/PKGBUILD
index 119d8fd414..9f9a611ae7 100644
--- a/mingw-w64-djvulibre/PKGBUILD
+++ b/mingw-w64-djvulibre/PKGBUILD
@@ -31,9 +31,9 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  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
 }
diff --git a/mingw-w64-dmake/PKGBUILD b/mingw-w64-dmake/PKGBUILD
index 5028589c2f..012d55590d 100644
--- a/mingw-w64-dmake/PKGBUILD
+++ b/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
 }
diff --git a/mingw-w64-docbook-dsssl/PKGBUILD b/mingw-w64-docbook-dsssl/PKGBUILD
index 16cb159088..926d7540de 100644
--- a/mingw-w64-docbook-dsssl/PKGBUILD
+++ b/mingw-w64-docbook-dsssl/PKGBUILD
@@ -21,13 +21,13 @@ sha256sums=('2f329e120bee9ef42fbdd74ddd60e05e49786c5a7953a0ff4c680ae6bdf0e2bc'
 
 prepare() {
   cd "$srcdir"/ 
-  cp -r "${_realname}-${pkgver}" "build-${CARCH}"
-  cd "build-${CARCH}"
+  cp -r "${_realname}-${pkgver}" "build-${MSYSTEM}"
+  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}" \
diff --git a/mingw-w64-dumb/PKGBUILD b/mingw-w64-dumb/PKGBUILD
index aa474b0748..b2eff68344 100644
--- a/mingw-w64-dumb/PKGBUILD
+++ b/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
-  mkdir -p "${srcdir}"/build-${CARCH}-shared && cd "${srcdir}"/build-${CARCH}-shared
+  [[ -d "${srcdir}"/build-${MSYSTEM}-shared ]] && rm -rf "${srcdir}"/build-${MSYSTEM}-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
-  mkdir -p "${srcdir}"/build-${CARCH}-static && cd "${srcdir}"/build-${CARCH}-static
+  [[ -d "${srcdir}"/build-${MSYSTEM}-static ]] && rm -rf "${srcdir}"/build-${MSYSTEM}-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
diff --git a/mingw-w64-enca/PKGBUILD b/mingw-w64-enca/PKGBUILD
index 94ed0fc13b..39d4ea97f6 100644
--- a/mingw-w64-enca/PKGBUILD
+++ b/mingw-w64-enca/PKGBUILD
@@ -28,8 +28,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  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"
diff --git a/mingw-w64-ensmallen/PKGBUILD b/mingw-w64-ensmallen/PKGBUILD
index 50230c03e0..fcdacfaa1d 100644
--- a/mingw-w64-ensmallen/PKGBUILD
+++ b/mingw-w64-ensmallen/PKGBUILD
@@ -24,8 +24,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${CARCH}" ]] && rm -rf "${srcdir}/build-${CARCH}"
-  mkdir -p "${srcdir}/build-${CARCH}" && cd "${srcdir}/build-${CARCH}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  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
diff --git a/mingw-w64-faac/PKGBUILD b/mingw-w64-faac/PKGBUILD
index f4921ed010..e6d270ed40 100644
--- a/mingw-w64-faac/PKGBUILD
+++ b/mingw-w64-faac/PKGBUILD
@@ -25,9 +25,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  cp -R "${_realname}-${pkgver//\./_}" "${srcdir}"/build-${CARCH}
-  cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  cp -R "${_realname}-${pkgver//\./_}" "${srcdir}"/build-${MSYSTEM}
+  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}"
 }
diff --git a/mingw-w64-fann/PKGBUILD b/mingw-w64-fann/PKGBUILD
index ec926c66a7..100ec07855 100644
--- a/mingw-w64-fann/PKGBUILD
+++ b/mingw-w64-fann/PKGBUILD
@@ -22,9 +22,9 @@ prepare() {
 }
 
 build() {
-  rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir "${srcdir}/build-${MSYSTEM}"
+  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
diff --git a/mingw-w64-farstream/PKGBUILD b/mingw-w64-farstream/PKGBUILD
index 587693e4fc..0f116981df 100644
--- a/mingw-w64-farstream/PKGBUILD
+++ b/mingw-w64-farstream/PKGBUILD
@@ -37,8 +37,8 @@ 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} \
@@ -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
diff --git a/mingw-w64-fastjar/PKGBUILD b/mingw-w64-fastjar/PKGBUILD
index 8ee0b928ec..7d57b1590f 100644
--- a/mingw-w64-fastjar/PKGBUILD
+++ b/mingw-w64-fastjar/PKGBUILD
@@ -20,8 +20,8 @@ sha256sums=('f156abc5de8658f22ee8f08d7a72c88f9409ebd8c7933e9466b0842afeb2f145')
 
 build() {
   cd "${srcdir}"/${_realname}-${pkgver}
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  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}"
 }
diff --git a/mingw-w64-fcrackzip/PKGBUILD b/mingw-w64-fcrackzip/PKGBUILD
index f19239e56b..ae137bb3f2 100644
--- a/mingw-w64-fcrackzip/PKGBUILD
+++ b/mingw-w64-fcrackzip/PKGBUILD
@@ -16,8 +16,8 @@ sha256sums=('4a58c8cb98177514ba17ee30d28d4927918bf0bdc3c94d260adfee44d2d43850')
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  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"
 }
diff --git a/mingw-w64-fdk-aac/PKGBUILD b/mingw-w64-fdk-aac/PKGBUILD
index ee1dd964a2..3f46fb6989 100644
--- a/mingw-w64-fdk-aac/PKGBUILD
+++ b/mingw-w64-fdk-aac/PKGBUILD
@@ -25,8 +25,8 @@ prepare() {
 
 build() {
   cd "${srcdir}"/${_realname}-${pkgver}
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  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
   
diff --git a/mingw-w64-ffms2/PKGBUILD b/mingw-w64-ffms2/PKGBUILD
index a261b64c07..3b447e399d 100644
--- a/mingw-w64-ffms2/PKGBUILD
+++ b/mingw-w64-ffms2/PKGBUILD
@@ -27,8 +27,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  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"
diff --git a/mingw-w64-ftgl/PKGBUILD b/mingw-w64-ftgl/PKGBUILD
index 3bd0383507..fc51662d85 100644
--- a/mingw-w64-ftgl/PKGBUILD
+++ b/mingw-w64-ftgl/PKGBUILD
@@ -30,9 +30,9 @@ prepare () {
 }
 
 build() {
-  rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir "${srcdir}/build-${MSYSTEM}"
+  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
diff --git a/mingw-w64-fxc2/PKGBUILD b/mingw-w64-fxc2/PKGBUILD
index 13f9437d19..9002fc4c63 100644
--- a/mingw-w64-fxc2/PKGBUILD
+++ b/mingw-w64-fxc2/PKGBUILD
@@ -29,15 +29,15 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
-  cp -rf ${_realname} build-${MINGW_CHOST}
-  cd build-${MINGW_CHOST}
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
+  cp -rf ${_realname} build-${MSYSTEM}
+  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/
 }
diff --git a/mingw-w64-gdl/PKGBUILD b/mingw-w64-gdl/PKGBUILD
index e00c74ecad..aba56b8d30 100644
--- a/mingw-w64-gdl/PKGBUILD
+++ b/mingw-w64-gdl/PKGBUILD
@@ -28,8 +28,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MINGW_CHOST} ]] && rm -rf "${srcdir}"/build-${MINGW_CHOST}
-  mkdir "${srcdir}"/build-${MINGW_CHOST}  && cd "${srcdir}"/build-${MINGW_CHOST}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  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"
diff --git a/mingw-w64-gegl/PKGBUILD b/mingw-w64-gegl/PKGBUILD
index 2b0c3ecd51..a4534a4b5e 100644
--- a/mingw-w64-gegl/PKGBUILD
+++ b/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
diff --git a/mingw-w64-geographiclib/PKGBUILD b/mingw-w64-geographiclib/PKGBUILD
index 35cedaa8c0..5f7d3484bf 100644
--- a/mingw-w64-geographiclib/PKGBUILD
+++ b/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}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  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
 
diff --git a/mingw-w64-geoip/PKGBUILD b/mingw-w64-geoip/PKGBUILD
index 663c6d9ff3..475740329c 100644
--- a/mingw-w64-geoip/PKGBUILD
+++ b/mingw-w64-geoip/PKGBUILD
@@ -25,8 +25,8 @@ prepare(){
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  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}"
 }
diff --git a/mingw-w64-ghc/PKGBUILD b/mingw-w64-ghc/PKGBUILD
index 5fff264b03..5c3a863aa4 100644
--- a/mingw-w64-ghc/PKGBUILD
+++ b/mingw-w64-ghc/PKGBUILD
@@ -127,31 +127,31 @@ validpgpkeys=('FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD') # Benjamin Gamari <ben
 prepare() {
   cd "${srcdir}"
 
-  mkdir -p ${CARCH}/host
-  rm -rf ${CARCH}/ghc-${pkgver}
+  mkdir -p ${MSYSTEM}/host
+  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}"
-  cd "${srcdir}/${CARCH}/ghc-${pkgver}"
+  export PATH="${srcdir}/${MSYSTEM}/host/bin:${PATH}"
+  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
 
diff --git a/mingw-w64-gl2ps/PKGBUILD b/mingw-w64-gl2ps/PKGBUILD
index c3f75d6e27..2c4b57d17e 100644
--- a/mingw-w64-gl2ps/PKGBUILD
+++ b/mingw-w64-gl2ps/PKGBUILD
@@ -28,9 +28,9 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
-  mkdir build-${MINGW_CHOST}
-  cd build-${MINGW_CHOST}
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
+  mkdir build-${MSYSTEM}
+  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
diff --git a/mingw-w64-glade/PKGBUILD b/mingw-w64-glade/PKGBUILD
index 3393f206f9..0475f719b9 100644
--- a/mingw-w64-glade/PKGBUILD
+++ b/mingw-w64-glade/PKGBUILD
@@ -38,8 +38,8 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  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"
diff --git a/mingw-w64-gperf/PKGBUILD b/mingw-w64-gperf/PKGBUILD
index a7f195cd36..1e49287ca2 100644
--- a/mingw-w64-gperf/PKGBUILD
+++ b/mingw-w64-gperf/PKGBUILD
@@ -28,8 +28,8 @@ prepare() {
 }
 
 build() {
-  mkdir ${srcdir}/build-${MINGW_CHOST}
-  cd "${srcdir}"/build-${MINGW_CHOST}
+  mkdir ${srcdir}/build-${MSYSTEM}
+  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
 }
diff --git a/mingw-w64-graphene/PKGBUILD b/mingw-w64-graphene/PKGBUILD
index 3f4acc0f6e..a65fd7de0b 100644
--- a/mingw-w64-graphene/PKGBUILD
+++ b/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}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  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"
diff --git a/mingw-w64-graphite2/PKGBUILD b/mingw-w64-graphite2/PKGBUILD
index e053039ca9..6cf31d438b 100644
--- a/mingw-w64-graphite2/PKGBUILD
+++ b/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}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  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
diff --git a/mingw-w64-gsm/PKGBUILD b/mingw-w64-gsm/PKGBUILD
index ae84ba01a3..67c5c458e5 100644
--- a/mingw-w64-gsm/PKGBUILD
+++ b/mingw-w64-gsm/PKGBUILD
@@ -32,13 +32,13 @@ prepare() {
 }
 
 build() {
-  cp -r ${srcdir}/${_realname}-${pkgver%.*}-pl${pkgver##*.} ${srcdir}/build-${MINGW_CHOST}
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cp -r ${srcdir}/${_realname}-${pkgver%.*}-pl${pkgver##*.} ${srcdir}/build-${MSYSTEM}
+  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}}}
diff --git a/mingw-w64-gss/PKGBUILD b/mingw-w64-gss/PKGBUILD
index a4a53b7aed..44b4f1a0d5 100644
--- a/mingw-w64-gss/PKGBUILD
+++ b/mingw-w64-gss/PKGBUILD
@@ -42,9 +42,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p build-${MINGW_CHOST}
-  cd build-${MINGW_CHOST}
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p build-${MSYSTEM}
+  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
 }
diff --git a/mingw-w64-gtk-doc/PKGBUILD b/mingw-w64-gtk-doc/PKGBUILD
index 2cfed21e7e..c4a902052a 100644
--- a/mingw-w64-gtk-doc/PKGBUILD
+++ b/mingw-w64-gtk-doc/PKGBUILD
@@ -35,8 +35,8 @@ prepare() {
 }
 
 build() {
-  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 \
@@ -51,7 +51,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   DESTDIR="${pkgdir}" meson install
 
   # Make relocatable (hacky... :/)
diff --git a/mingw-w64-gtk-engine-murrine/PKGBUILD b/mingw-w64-gtk-engine-murrine/PKGBUILD
index b401a2ada2..338b513e2e 100644
--- a/mingw-w64-gtk-engine-murrine/PKGBUILD
+++ b/mingw-w64-gtk-engine-murrine/PKGBUILD
@@ -23,8 +23,8 @@ prepare() {
   autoreconf -fiv
 }
 build() {
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  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
 }
diff --git a/mingw-w64-gtk-engines/PKGBUILD b/mingw-w64-gtk-engines/PKGBUILD
index 7350873189..8138f615e1 100644
--- a/mingw-w64-gtk-engines/PKGBUILD
+++ b/mingw-w64-gtk-engines/PKGBUILD
@@ -28,8 +28,8 @@ 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} \
@@ -40,6 +40,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-gtk2/PKGBUILD b/mingw-w64-gtk2/PKGBUILD
index 9e227bcec2..b2d73cd4b1 100644
--- a/mingw-w64-gtk2/PKGBUILD
+++ b/mingw-w64-gtk2/PKGBUILD
@@ -86,8 +86,8 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  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
diff --git a/mingw-w64-gtkglarea/PKGBUILD b/mingw-w64-gtkglarea/PKGBUILD
index 016eb5468e..dd645160bf 100644
--- a/mingw-w64-gtkglarea/PKGBUILD
+++ b/mingw-w64-gtkglarea/PKGBUILD
@@ -32,8 +32,8 @@ prepare() {
 }
 
 build() {
-  cp -r "${srcdir}/gtkglarea-${pkgver}" "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cp -r "${srcdir}/gtkglarea-${pkgver}" "${srcdir}/build-${MSYSTEM}"
+  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
diff --git a/mingw-w64-gtkglext/PKGBUILD b/mingw-w64-gtkglext/PKGBUILD
index cd45c09221..d9410572bb 100644
--- a/mingw-w64-gtkglext/PKGBUILD
+++ b/mingw-w64-gtkglext/PKGBUILD
@@ -30,9 +30,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  cp -r "${srcdir}/gtkglext-${pkgver}" "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  cp -r "${srcdir}/gtkglext-${pkgver}" "${srcdir}/build-${MSYSTEM}"
+  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
 }
diff --git a/mingw-w64-gtkmm/PKGBUILD b/mingw-w64-gtkmm/PKGBUILD
index e69633c9a4..dae84296c9 100644
--- a/mingw-w64-gtkmm/PKGBUILD
+++ b/mingw-w64-gtkmm/PKGBUILD
@@ -27,8 +27,8 @@ prepare() {
 
 build() {
   CPPFLAGS+=" -D_REENTRANT"
-  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} \
@@ -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"
diff --git a/mingw-w64-gtksourceview3/PKGBUILD b/mingw-w64-gtksourceview3/PKGBUILD
index e939a94b38..2c13df52bc 100644
--- a/mingw-w64-gtksourceview3/PKGBUILD
+++ b/mingw-w64-gtksourceview3/PKGBUILD
@@ -33,8 +33,8 @@ prepare() {
 }
 
 build() {
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  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"
diff --git a/mingw-w64-gtksourceviewmm3/PKGBUILD b/mingw-w64-gtksourceviewmm3/PKGBUILD
index 96e4540d99..13088a59bb 100644
--- a/mingw-w64-gtksourceviewmm3/PKGBUILD
+++ b/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}
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  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"
diff --git a/mingw-w64-gts/PKGBUILD b/mingw-w64-gts/PKGBUILD
index c410b97feb..072375de59 100644
--- a/mingw-w64-gts/PKGBUILD
+++ b/mingw-w64-gts/PKGBUILD
@@ -24,9 +24,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  cp -rf "${srcdir}"/${_realname}-${pkgver}/. "${srcdir}"/build-${CARCH}
-  cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  cp -rf "${srcdir}"/${_realname}-${pkgver}/. "${srcdir}"/build-${MSYSTEM}
+  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})
diff --git a/mingw-w64-gxml/PKGBUILD b/mingw-w64-gxml/PKGBUILD
index 2acd028444..9537d6e9f7 100644
--- a/mingw-w64-gxml/PKGBUILD
+++ b/mingw-w64-gxml/PKGBUILD
@@ -32,9 +32,9 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p build-${MINGW_CHOST}
-  cd build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM}
+  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
diff --git a/mingw-w64-hlsl2glsl-git/PKGBUILD b/mingw-w64-hlsl2glsl-git/PKGBUILD
index 9621482fe6..eb5a553262 100644
--- a/mingw-w64-hlsl2glsl-git/PKGBUILD
+++ b/mingw-w64-hlsl2glsl-git/PKGBUILD
@@ -42,8 +42,8 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${CARCH} ]] && rm -rf build-${CARCH}
-  mkdir build-${CARCH} && cd build-${CARCH}
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
+  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}
 }
diff --git a/mingw-w64-http-parser/PKGBUILD b/mingw-w64-http-parser/PKGBUILD
index b56aeb577b..4ee5546f4f 100644
--- a/mingw-w64-http-parser/PKGBUILD
+++ b/mingw-w64-http-parser/PKGBUILD
@@ -24,9 +24,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
-  cp -R ${srcdir}/${_realname}-${pkgver}/. "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
+  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/
diff --git a/mingw-w64-hunspell/PKGBUILD b/mingw-w64-hunspell/PKGBUILD
index febadd241e..d11a6d98d9 100644
--- a/mingw-w64-hunspell/PKGBUILD
+++ b/mingw-w64-hunspell/PKGBUILD
@@ -59,9 +59,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  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
diff --git a/mingw-w64-hyphen/PKGBUILD b/mingw-w64-hyphen/PKGBUILD
index 41f8a111bd..2af5e440b7 100644
--- a/mingw-w64-hyphen/PKGBUILD
+++ b/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}" && \
-    cd "${srcdir}"/build-${CARCH}
+  cp -a "${srcdir}/${_realname}-${pkgver}" "${srcdir}/build-${MSYSTEM}" && \
+    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
diff --git a/mingw-w64-indent/PKGBUILD b/mingw-w64-indent/PKGBUILD
index 954b24a9a0..bf990ebe3e 100644
--- a/mingw-w64-indent/PKGBUILD
+++ b/mingw-w64-indent/PKGBUILD
@@ -68,8 +68,8 @@ prepare() {
 
 build() {
   CFLAGS+=" -Wno-error=nested-externs"
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  cp -rf ${_realname}-${pkgver} "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  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
 }
diff --git a/mingw-w64-jbig2dec/PKGBUILD b/mingw-w64-jbig2dec/PKGBUILD
index 454babeb52..8ad9a86907 100644
--- a/mingw-w64-jbig2dec/PKGBUILD
+++ b/mingw-w64-jbig2dec/PKGBUILD
@@ -36,8 +36,8 @@ prepare() {
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  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
diff --git a/mingw-w64-jxrlib/PKGBUILD b/mingw-w64-jxrlib/PKGBUILD
index f7eaf71d0d..bf3cb97bf2 100644
--- a/mingw-w64-jxrlib/PKGBUILD
+++ b/mingw-w64-jxrlib/PKGBUILD
@@ -47,8 +47,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${CARCH}" ]] && rm -rf "${srcdir}/build-${CARCH}"
-  mkdir -p "${srcdir}/build-${CARCH}" && cd "${srcdir}/build-${CARCH}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  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
 }
diff --git a/mingw-w64-l-smash/PKGBUILD b/mingw-w64-l-smash/PKGBUILD
index e232b70599..d66fbf50ab 100644
--- a/mingw-w64-l-smash/PKGBUILD
+++ b/mingw-w64-l-smash/PKGBUILD
@@ -27,9 +27,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
-  mkdir -p ${srcdir}/build-${MINGW_CHOST}
-  cd ${srcdir}/build-${MINGW_CHOST}
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
+  mkdir -p ${srcdir}/build-${MSYSTEM}
+  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
diff --git a/mingw-w64-lame/PKGBUILD b/mingw-w64-lame/PKGBUILD
index 7f0f7bf0c9..27a909f5bc 100644
--- a/mingw-w64-lame/PKGBUILD
+++ b/mingw-w64-lame/PKGBUILD
@@ -54,9 +54,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  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
 }
diff --git a/mingw-w64-lcms/PKGBUILD b/mingw-w64-lcms/PKGBUILD
index 9e122dce3e..020fe0a1dd 100644
--- a/mingw-w64-lcms/PKGBUILD
+++ b/mingw-w64-lcms/PKGBUILD
@@ -42,9 +42,9 @@ prepare(){
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  cp -rf ${srcdir}/${_realname}-${pkgver} "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  cp -rf ${srcdir}/${_realname}-${pkgver} "${srcdir}/build-${MSYSTEM}"
+  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
 }
diff --git a/mingw-w64-libaacs/PKGBUILD b/mingw-w64-libaacs/PKGBUILD
index 599205e6d6..49dc1056fe 100644
--- a/mingw-w64-libaacs/PKGBUILD
+++ b/mingw-w64-libaacs/PKGBUILD
@@ -22,8 +22,8 @@ prepare() {
 
 build() {
   cd "$srcdir"/${_realname}-${pkgver}
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  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
diff --git a/mingw-w64-libao/PKGBUILD b/mingw-w64-libao/PKGBUILD
index 0ef2c56b28..5256dc3b1a 100644
--- a/mingw-w64-libao/PKGBUILD
+++ b/mingw-w64-libao/PKGBUILD
@@ -24,8 +24,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  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"
diff --git a/mingw-w64-libart_lgpl/PKGBUILD b/mingw-w64-libart_lgpl/PKGBUILD
index 27de349724..b812f568a6 100644
--- a/mingw-w64-libart_lgpl/PKGBUILD
+++ b/mingw-w64-libart_lgpl/PKGBUILD
@@ -29,8 +29,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  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}
diff --git a/mingw-w64-libbdplus/PKGBUILD b/mingw-w64-libbdplus/PKGBUILD
index cca1b80f64..3a58d71599 100644
--- a/mingw-w64-libbdplus/PKGBUILD
+++ b/mingw-w64-libbdplus/PKGBUILD
@@ -17,8 +17,8 @@ sha256sums=('b93eea3eaef33d6e9155d2c34b068c505493aa5a4936e63274f4342ab0f40a58')
 
 build() {
   cd "$srcdir"/${_realname}-${pkgver}
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  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
diff --git a/mingw-w64-libbs2b/PKGBUILD b/mingw-w64-libbs2b/PKGBUILD
index e3f7c8bb83..bcf0e9ebb1 100644
--- a/mingw-w64-libbs2b/PKGBUILD
+++ b/mingw-w64-libbs2b/PKGBUILD
@@ -25,8 +25,8 @@ prepare() {
 
 build() {
   cd "$srcdir"/${_realname}-${pkgver}
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  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}"
 }
diff --git a/mingw-w64-libcaca/PKGBUILD b/mingw-w64-libcaca/PKGBUILD
index ccb63c563d..22bdc8a8f1 100644
--- a/mingw-w64-libcaca/PKGBUILD
+++ b/mingw-w64-libcaca/PKGBUILD
@@ -44,8 +44,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  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
 
diff --git a/mingw-w64-libcddb/PKGBUILD b/mingw-w64-libcddb/PKGBUILD
index 651108b560..e4705415d6 100644
--- a/mingw-w64-libcddb/PKGBUILD
+++ b/mingw-w64-libcddb/PKGBUILD
@@ -48,8 +48,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  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
 }
diff --git a/mingw-w64-libcdio-paranoia/PKGBUILD b/mingw-w64-libcdio-paranoia/PKGBUILD
index 5c346c4063..0d6122c528 100644
--- a/mingw-w64-libcdio-paranoia/PKGBUILD
+++ b/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
 }
diff --git a/mingw-w64-libcdio/PKGBUILD b/mingw-w64-libcdio/PKGBUILD
index 386dfb4a25..0ea824dc40 100644
--- a/mingw-w64-libcdio/PKGBUILD
+++ b/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 */|" \
diff --git a/mingw-w64-libconfini/PKGBUILD b/mingw-w64-libconfini/PKGBUILD
index ed1a507c15..054be0448e 100644
--- a/mingw-w64-libconfini/PKGBUILD
+++ b/mingw-w64-libconfini/PKGBUILD
@@ -23,8 +23,8 @@ prepare() {
 }
 
 build() {
-  [ -d "${srcdir}/build-${MINGW_CHOST}" ] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [ -d "${srcdir}/build-${MSYSTEM}" ] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  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
 }
diff --git a/mingw-w64-libcue/PKGBUILD b/mingw-w64-libcue/PKGBUILD
index bb4efcc2bc..d516a20e00 100644
--- a/mingw-w64-libcue/PKGBUILD
+++ b/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
-  mkdir -p "${srcdir}/build-${CARCH}-static" && cd "${srcdir}/build-${CARCH}-static"
+  [[ -d ${srcdir}/build-${MSYSTEM}-static ]] && rm -rf ${srcdir}/build-${MSYSTEM}-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
-  mkdir -p "${srcdir}"/build-${CARCH}-shared && cd "${srcdir}"/build-${CARCH}-shared
+  [[ -d "${srcdir}"/build-${MSYSTEM}-shared ]] && rm -rf "${srcdir}"/build-${MSYSTEM}-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"
diff --git a/mingw-w64-libdca/PKGBUILD b/mingw-w64-libdca/PKGBUILD
index b89f2e95b4..5e37d5ec48 100644
--- a/mingw-w64-libdca/PKGBUILD
+++ b/mingw-w64-libdca/PKGBUILD
@@ -30,8 +30,8 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  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
diff --git a/mingw-w64-libdvbpsi/PKGBUILD b/mingw-w64-libdvbpsi/PKGBUILD
index cc5d4b1b79..c0868eb94a 100644
--- a/mingw-w64-libdvbpsi/PKGBUILD
+++ b/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}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  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
 }
diff --git a/mingw-w64-libdvdcss/PKGBUILD b/mingw-w64-libdvdcss/PKGBUILD
index e644a7c52d..71528fb98e 100644
--- a/mingw-w64-libdvdcss/PKGBUILD
+++ b/mingw-w64-libdvdcss/PKGBUILD
@@ -23,9 +23,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  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
 }
diff --git a/mingw-w64-libdvdnav/PKGBUILD b/mingw-w64-libdvdnav/PKGBUILD
index 801ebf31dc..c5de27ed5e 100644
--- a/mingw-w64-libdvdnav/PKGBUILD
+++ b/mingw-w64-libdvdnav/PKGBUILD
@@ -26,9 +26,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  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
 }
diff --git a/mingw-w64-libebur128/PKGBUILD b/mingw-w64-libebur128/PKGBUILD
index 17050575fb..2091241e89 100644
--- a/mingw-w64-libebur128/PKGBUILD
+++ b/mingw-w64-libebur128/PKGBUILD
@@ -25,8 +25,8 @@ prepare() {
 }
 
 build() {
-  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 \
@@ -39,7 +39,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build . --target install
 }
diff --git a/mingw-w64-libelf/PKGBUILD b/mingw-w64-libelf/PKGBUILD
index 3bd96303da..87060b1edf 100644
--- a/mingw-w64-libelf/PKGBUILD
+++ b/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} 
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH} 
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM} 
+  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}"
 }
diff --git a/mingw-w64-libffi/PKGBUILD b/mingw-w64-libffi/PKGBUILD
index 47df87cf07..d9b3525693 100644
--- a/mingw-w64-libffi/PKGBUILD
+++ b/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"
diff --git a/mingw-w64-libftdi/PKGBUILD b/mingw-w64-libftdi/PKGBUILD
index f3d072a560..98059e1aab 100644
--- a/mingw-w64-libftdi/PKGBUILD
+++ b/mingw-w64-libftdi/PKGBUILD
@@ -47,9 +47,9 @@ prepare() {
 }
 
 build() {
-  rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  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}"
-  PATH=$PATH:"${srcdir}/build-${MINGW_CHOST}/src" make check || true
+  cd "${srcdir}/build-${MSYSTEM}"
+  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}"
diff --git a/mingw-w64-libgdata/PKGBUILD b/mingw-w64-libgdata/PKGBUILD
index 29cc039245..467aabc5bb 100644
--- a/mingw-w64-libgdata/PKGBUILD
+++ b/mingw-w64-libgdata/PKGBUILD
@@ -42,9 +42,9 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
-  mkdir -p build-${MINGW_CHOST}
-  cd build-${MINGW_CHOST}
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM}
+  cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   ${MINGW_PREFIX}/bin/meson \
@@ -63,12 +63,12 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/meson.exe test || true
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/meson.exe install
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
diff --git a/mingw-w64-libgee/PKGBUILD b/mingw-w64-libgee/PKGBUILD
index 5cb4476f42..66cca810e9 100644
--- a/mingw-w64-libgee/PKGBUILD
+++ b/mingw-w64-libgee/PKGBUILD
@@ -33,8 +33,8 @@ prepare() {
 }
 
 build() {
-  mkdir -p build-${MINGW_CHOST}
-  cd build-${MINGW_CHOST}
+  mkdir -p build-${MSYSTEM}
+  cd build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
     --host=${MINGW_CHOST} \
@@ -47,7 +47,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"
diff --git a/mingw-w64-libglade/PKGBUILD b/mingw-w64-libglade/PKGBUILD
index 4352569c41..371c928a85 100644
--- a/mingw-w64-libglade/PKGBUILD
+++ b/mingw-w64-libglade/PKGBUILD
@@ -36,9 +36,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  cp -r "${srcdir}/${_realname}-${pkgver}" "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  cp -r "${srcdir}/${_realname}-${pkgver}" "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   PYTHON=${MINGW_PREFIX}/bin/python \
   ./configure \
@@ -53,7 +53,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install -j1
   install -m755 libglade-convert "${pkgdir}${MINGW_PREFIX}/bin/"
 }
diff --git a/mingw-w64-libgme/PKGBUILD b/mingw-w64-libgme/PKGBUILD
index fa80140054..9428be522e 100644
--- a/mingw-w64-libgme/PKGBUILD
+++ b/mingw-w64-libgme/PKGBUILD
@@ -35,8 +35,8 @@ prepare() {
 
 build() {
   echo "Building static library"
-  [[ -d "${srcdir}/build-${CARCH}-static" ]] && rm -rf "${srcdir}/build-${CARCH}-static"
-  mkdir -p "${srcdir}/build-${CARCH}-static" && cd "${srcdir}/build-${CARCH}-static"
+  [[ -d "${srcdir}/build-${MSYSTEM}-static" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-static"
+  mkdir -p "${srcdir}/build-${MSYSTEM}-static" && cd "${srcdir}/build-${MSYSTEM}-static"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
@@ -50,8 +50,8 @@ build() {
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
 
   echo "Building shared library"
-  [[ -d "${srcdir}/build-${CARCH}-shared" ]] && rm -rf "${srcdir}/build-${CARCH}-shared"
-  mkdir -p "${srcdir}/build-${CARCH}-shared" && cd "${srcdir}/build-${CARCH}-shared"
+  [[ -d "${srcdir}/build-${MSYSTEM}-shared" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-shared"
+  mkdir -p "${srcdir}/build-${MSYSTEM}-shared" && cd "${srcdir}/build-${MSYSTEM}-shared"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
@@ -66,10 +66,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}/game-music-emu-${pkgver}/license.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/license.txt"
diff --git a/mingw-w64-libgnomecanvas/PKGBUILD b/mingw-w64-libgnomecanvas/PKGBUILD
index 77d7e55e67..2683b8339b 100644
--- a/mingw-w64-libgnomecanvas/PKGBUILD
+++ b/mingw-w64-libgnomecanvas/PKGBUILD
@@ -28,8 +28,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
   ../${_realname}-${pkgver}/configure \
      --prefix=${MINGW_PREFIX} \
      --exec-prefix=${MINGW_PREFIX} \
@@ -49,7 +49,7 @@ check() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make DESTDIR="${pkgdir}" install
 
   cd "${srcdir}"/${_realname}-${pkgver}
diff --git a/mingw-w64-libgnurx/PKGBUILD b/mingw-w64-libgnurx/PKGBUILD
index 8e68b0aaf6..c7cd0c2fe5 100644
--- a/mingw-w64-libgnurx/PKGBUILD
+++ b/mingw-w64-libgnurx/PKGBUILD
@@ -37,7 +37,7 @@ prepare() {
 
 build()
 {
-  mkdir -p $srcdir/build-${CARCH} && cd $srcdir/build-${CARCH}
+  mkdir -p $srcdir/build-${MSYSTEM} && cd $srcdir/build-${MSYSTEM}
   ../mingw-libgnurx-${pkgver}/configure \
       --prefix=${MINGW_PREFIX} \
       --host=${MINGW_CHOST}
@@ -46,7 +46,7 @@ build()
 
 package()
 {
-  cd "$srcdir/build-${CARCH}"
+  cd "$srcdir/build-${MSYSTEM}"
   mkdir -p "${pkgdir}${MINGW_PREFIX}"/include
   make install DESTDIR="$pkgdir"
   cp -f ${pkgdir}${MINGW_PREFIX}/lib/libgnurx.dll.a ${pkgdir}${MINGW_PREFIX}/lib/libregex.dll.a
diff --git a/mingw-w64-libgoom2/PKGBUILD b/mingw-w64-libgoom2/PKGBUILD
index 1836cc04a7..6df6fe8fa1 100644
--- a/mingw-w64-libgoom2/PKGBUILD
+++ b/mingw-w64-libgoom2/PKGBUILD
@@ -40,8 +40,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
   ../goom2k4-0/configure \
       --prefix=${MINGW_PREFIX} \
       --build=${MINGW_CHOST} \
@@ -56,11 +56,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
 }
diff --git a/mingw-w64-libgxps/PKGBUILD b/mingw-w64-libgxps/PKGBUILD
index 819f2067d4..bd61cfddc8 100644
--- a/mingw-w64-libgxps/PKGBUILD
+++ b/mingw-w64-libgxps/PKGBUILD
@@ -38,9 +38,9 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
-  mkdir -p build-${MINGW_CHOST}
-  cd build-${MINGW_CHOST}
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM}
+  cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   ${MINGW_PREFIX}/bin/meson \
@@ -54,7 +54,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"
diff --git a/mingw-w64-libidl2/PKGBUILD b/mingw-w64-libidl2/PKGBUILD
index 98d47b89e9..45df345473 100644
--- a/mingw-w64-libidl2/PKGBUILD
+++ b/mingw-w64-libidl2/PKGBUILD
@@ -26,8 +26,8 @@ prepare() {
 
 build() {
   cd "${srcdir}"/libIDL-${pkgver}
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
   ../libIDL-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -40,6 +40,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-libilbc/PKGBUILD b/mingw-w64-libilbc/PKGBUILD
index e9c7936ed1..7567dede42 100644
--- a/mingw-w64-libilbc/PKGBUILD
+++ b/mingw-w64-libilbc/PKGBUILD
@@ -26,8 +26,8 @@ build() {
     extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
@@ -41,7 +41,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make DESTDIR="${pkgdir}" install
 
   install -D -m644 ${srcdir}/${_realname}-${pkgver}/COPYING "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
diff --git a/mingw-w64-libmad/PKGBUILD b/mingw-w64-libmad/PKGBUILD
index 34ca3976db..2813ea896b 100644
--- a/mingw-w64-libmad/PKGBUILD
+++ b/mingw-w64-libmad/PKGBUILD
@@ -52,9 +52,9 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
-  mkdir -p ${srcdir}/build-${MINGW_CHOST}
-  cd ${srcdir}/build-${MINGW_CHOST}
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
+  mkdir -p ${srcdir}/build-${MSYSTEM}
+  cd ${srcdir}/build-${MSYSTEM}
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -66,6 +66,6 @@ build() {
 }
 
 package() {
-  cd build-${MINGW_CHOST}
+  cd build-${MSYSTEM}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-libmicrodns/PKGBUILD b/mingw-w64-libmicrodns/PKGBUILD
index 15fc2b1249..df1a4c7379 100644
--- a/mingw-w64-libmicrodns/PKGBUILD
+++ b/mingw-w64-libmicrodns/PKGBUILD
@@ -26,8 +26,8 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   ${MINGW_PREFIX}/bin/meson \
@@ -39,7 +39,7 @@ build() {
 }
 
 package() {
-  cd build-${MINGW_CHOST}
+  cd build-${MSYSTEM}
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/ninja install
 
   install -Dm644 ${srcdir}/${_realname}-${pkgver}/COPYING ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING
diff --git a/mingw-w64-libmikmod/PKGBUILD b/mingw-w64-libmikmod/PKGBUILD
index 287a9bfe6d..16ac62b381 100644
--- a/mingw-w64-libmikmod/PKGBUILD
+++ b/mingw-w64-libmikmod/PKGBUILD
@@ -26,9 +26,9 @@ sha256sums=('adef6214863516a4a5b44ebf2c71ef84ecdfeb3444973dacbac70911c9bc67e9')
 
 build() {
   export lt_cv_deplibs_check_method='pass_all'
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  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 DESTDIR="${pkgdir}" install
 
   # Install license
diff --git a/mingw-w64-libmimic/PKGBUILD b/mingw-w64-libmimic/PKGBUILD
index 2c0ac1d6b0..f73af5795c 100644
--- a/mingw-w64-libmimic/PKGBUILD
+++ b/mingw-w64-libmimic/PKGBUILD
@@ -31,9 +31,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -49,6 +49,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-libmodplug/PKGBUILD b/mingw-w64-libmodplug/PKGBUILD
index ecd2d29312..14c036640d 100644
--- a/mingw-w64-libmodplug/PKGBUILD
+++ b/mingw-w64-libmodplug/PKGBUILD
@@ -30,9 +30,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  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 license
diff --git a/mingw-w64-libmpcdec/PKGBUILD b/mingw-w64-libmpcdec/PKGBUILD
index 27e97edcd8..271225abee 100644
--- a/mingw-w64-libmpcdec/PKGBUILD
+++ b/mingw-w64-libmpcdec/PKGBUILD
@@ -49,8 +49,8 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${CARCH} ]] && rm -rf ${srcdir}/build-${CARCH}
-  mkdir -p "${srcdir}/build-${CARCH}" && cd "${srcdir}/build-${CARCH}"
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../musepack_src_r${_rel}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -65,6 +65,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-libmpeg2-git/PKGBUILD b/mingw-w64-libmpeg2-git/PKGBUILD
index db842c1a4c..8fb0e854b3 100644
--- a/mingw-w64-libmpeg2-git/PKGBUILD
+++ b/mingw-w64-libmpeg2-git/PKGBUILD
@@ -40,8 +40,8 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${CARCH} ]] && rm -rf build-${CARCH}
-  mkdir build-${CARCH} && cd build-${CARCH}
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
+  mkdir build-${MSYSTEM} && cd build-${MSYSTEM}
   ../${_realname}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -54,6 +54,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-libnova/PKGBUILD b/mingw-w64-libnova/PKGBUILD
index 88a443d8ed..5ec7283950 100644
--- a/mingw-w64-libnova/PKGBUILD
+++ b/mingw-w64-libnova/PKGBUILD
@@ -24,8 +24,8 @@ prepare() {
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -38,11 +38,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}"
 }
diff --git a/mingw-w64-libnumbertext/PKGBUILD b/mingw-w64-libnumbertext/PKGBUILD
index 7e55945a7c..93f3ae4ae7 100644
--- a/mingw-w64-libnumbertext/PKGBUILD
+++ b/mingw-w64-libnumbertext/PKGBUILD
@@ -24,8 +24,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -38,12 +38,12 @@ build() {
 }
 
 check() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make -k check
 }
 
 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
diff --git a/mingw-w64-libogg/PKGBUILD b/mingw-w64-libogg/PKGBUILD
index dadba47838..9f36728a0c 100644
--- a/mingw-w64-libogg/PKGBUILD
+++ b/mingw-w64-libogg/PKGBUILD
@@ -31,8 +31,8 @@ build() {
   fi
 
   # Static
-  [[ -d "${srcdir}/build-${MINGW_CHOST}-static" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}-static"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}-static" && cd "${srcdir}/build-${MINGW_CHOST}-static"
+  [[ -d "${srcdir}/build-${MSYSTEM}-static" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-static"
+  mkdir -p "${srcdir}/build-${MSYSTEM}-static" && cd "${srcdir}/build-${MSYSTEM}-static"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     ${MINGW_PREFIX}/bin/cmake \
@@ -46,8 +46,8 @@ build() {
   make
 
   # Shared
-  [[ -d "${srcdir}/build-${MINGW_CHOST}-shared" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}-shared"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}-shared" && cd "${srcdir}/build-${MINGW_CHOST}-shared"
+  [[ -d "${srcdir}/build-${MSYSTEM}-shared" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-shared"
+  mkdir -p "${srcdir}/build-${MSYSTEM}-shared" && cd "${srcdir}/build-${MSYSTEM}-shared"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     ${MINGW_PREFIX}/bin/cmake \
@@ -63,11 +63,11 @@ build() {
 
 package() {
   # Static
-  cd "${srcdir}/build-${MINGW_CHOST}-static"
+  cd "${srcdir}/build-${MSYSTEM}-static"
   make DESTDIR="${pkgdir}" install
 
   # Shared
-  cd "${srcdir}/build-${MINGW_CHOST}-shared"
+  cd "${srcdir}/build-${MSYSTEM}-shared"
   make DESTDIR="${pkgdir}" install
 
   # m4
diff --git a/mingw-w64-libopenmpt-modplug/PKGBUILD b/mingw-w64-libopenmpt-modplug/PKGBUILD
index eb2705d535..bc0b26ad9d 100644
--- a/mingw-w64-libopenmpt-modplug/PKGBUILD
+++ b/mingw-w64-libopenmpt-modplug/PKGBUILD
@@ -25,8 +25,8 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${CARCH} ]] && rm -rf ${srcdir}/build-${CARCH}
-  mkdir -p "${srcdir}/build-${CARCH}" && cd "${srcdir}/build-${CARCH}"
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
   ../${_realname}-${pkgver}-openmpt1/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -40,12 +40,12 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make check || true
 }
 
 package() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}-openmpt1/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
diff --git a/mingw-w64-libopusenc/PKGBUILD b/mingw-w64-libopusenc/PKGBUILD
index 0b3bc935d1..149a8668cb 100644
--- a/mingw-w64-libopusenc/PKGBUILD
+++ b/mingw-w64-libopusenc/PKGBUILD
@@ -17,9 +17,9 @@ source=(https://downloads.xiph.org/releases/opus/${_realname}-${pkgver}.tar.gz)
 sha256sums=('8298db61a8d3d63e41c1a80705baa8ce9ff3f50452ea7ec1c19a564fe106cbb9')
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -32,7 +32,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-libreplaygain/PKGBUILD b/mingw-w64-libreplaygain/PKGBUILD
index 1d32e07a63..03400562e7 100644
--- a/mingw-w64-libreplaygain/PKGBUILD
+++ b/mingw-w64-libreplaygain/PKGBUILD
@@ -23,8 +23,8 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${CARCH} ]] && rm -rf ${srcdir}/build-${CARCH}
-  mkdir -p "${srcdir}/build-${CARCH}" && cd "${srcdir}/build-${CARCH}"
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}_r${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -38,6 +38,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-librest/PKGBUILD b/mingw-w64-librest/PKGBUILD
index 70f69c541b..da09021396 100644
--- a/mingw-w64-librest/PKGBUILD
+++ b/mingw-w64-librest/PKGBUILD
@@ -32,8 +32,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   ${MINGW_PREFIX}/bin/meson.exe setup \
@@ -48,7 +48,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/ninja.exe install
 
diff --git a/mingw-w64-librsync/PKGBUILD b/mingw-w64-librsync/PKGBUILD
index 931f29680f..08a9c3fe97 100644
--- a/mingw-w64-librsync/PKGBUILD
+++ b/mingw-w64-librsync/PKGBUILD
@@ -30,8 +30,8 @@ build() {
   fi
 
   # Static
-  [[ -d ${srcdir}/build-${MINGW_CHOST}-static ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}-static
-  mkdir -p ${srcdir}/build-${MINGW_CHOST}-static && cd ${srcdir}/build-${MINGW_CHOST}-static
+  [[ -d ${srcdir}/build-${MSYSTEM}-static ]] && rm -rf ${srcdir}/build-${MSYSTEM}-static
+  mkdir -p ${srcdir}/build-${MSYSTEM}-static && cd ${srcdir}/build-${MSYSTEM}-static
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
     -G"MSYS Makefiles" \
@@ -43,8 +43,8 @@ build() {
   make
 
   # Shared
-  [[ -d ${srcdir}/build-${MINGW_CHOST}-shared ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}-shared
-  mkdir -p ${srcdir}/build-${MINGW_CHOST}-shared && cd ${srcdir}/build-${MINGW_CHOST}-shared
+  [[ -d ${srcdir}/build-${MSYSTEM}-shared ]] && rm -rf ${srcdir}/build-${MSYSTEM}-shared
+  mkdir -p ${srcdir}/build-${MSYSTEM}-shared && cd ${srcdir}/build-${MSYSTEM}-shared
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
@@ -61,11 +61,11 @@ build() {
 
 package () {
   # Static
-  cd "${srcdir}/build-${MINGW_CHOST}-static"
+  cd "${srcdir}/build-${MSYSTEM}-static"
   make DESTDIR=${pkgdir} install
   
   # Shared
-  cd "${srcdir}/build-${MINGW_CHOST}-shared"
+  cd "${srcdir}/build-${MSYSTEM}-shared"
   make DESTDIR=${pkgdir} install
 
   # Install docs
diff --git a/mingw-w64-libsignal-protocol-c/PKGBUILD b/mingw-w64-libsignal-protocol-c/PKGBUILD
index 0cd3d0f4a7..e2d85ce47a 100644
--- a/mingw-w64-libsignal-protocol-c/PKGBUILD
+++ b/mingw-w64-libsignal-protocol-c/PKGBUILD
@@ -28,8 +28,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   declare -a _extra_config
   if check_option "debug" "n"; then
@@ -50,12 +50,12 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/ctest.exe ./ || true
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
diff --git a/mingw-w64-libsigsegv/PKGBUILD b/mingw-w64-libsigsegv/PKGBUILD
index 95d0f910cd..8a1b445938 100644
--- a/mingw-w64-libsigsegv/PKGBUILD
+++ b/mingw-w64-libsigsegv/PKGBUILD
@@ -24,8 +24,8 @@ prepare() {
 
 build() {
   cd "${srcdir}"/${_realname}-${pkgver}
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  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-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make install DESTDIR="${pkgdir}"
 }
diff --git a/mingw-w64-libsoup/PKGBUILD b/mingw-w64-libsoup/PKGBUILD
index 11a8bf0172..c2b9fef71c 100644
--- a/mingw-w64-libsoup/PKGBUILD
+++ b/mingw-w64-libsoup/PKGBUILD
@@ -36,8 +36,8 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   CFLAGS+=" -fcommon"  # work around gcc 10 being stricter here
   MSYS2_ARG_CONV_EXCL="--prefix=" \
@@ -57,7 +57,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   DESTDIR="${pkgdir}" ninja install
 
diff --git a/mingw-w64-libsystre/PKGBUILD b/mingw-w64-libsystre/PKGBUILD
index 88d72e632b..a368542742 100644
--- a/mingw-w64-libsystre/PKGBUILD
+++ b/mingw-w64-libsystre/PKGBUILD
@@ -25,8 +25,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
   ../systre-${pkgver}/configure\
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -39,7 +39,7 @@ build() {
 }
 
 package() {
-  cd build-${MINGW_CHOST}
+  cd build-${MSYSTEM}
   make DESTDIR="${pkgdir}" install
   install -D -m644 "${srcdir}/systre-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 }
diff --git a/mingw-w64-libtasn1/PKGBUILD b/mingw-w64-libtasn1/PKGBUILD
index 42aae66f66..5d8d500d04 100644
--- a/mingw-w64-libtasn1/PKGBUILD
+++ b/mingw-w64-libtasn1/PKGBUILD
@@ -31,8 +31,8 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && 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
 
   find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm
diff --git a/mingw-w64-libtheora/PKGBUILD b/mingw-w64-libtheora/PKGBUILD
index be89ee733a..10aeb5d46b 100644
--- a/mingw-w64-libtheora/PKGBUILD
+++ b/mingw-w64-libtheora/PKGBUILD
@@ -35,7 +35,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
   mkdir -p ${srcdir}/build-$MINGW_CHOST
   cd "${srcdir}/build-$MINGW_CHOST"
 
diff --git a/mingw-w64-libtimidity/PKGBUILD b/mingw-w64-libtimidity/PKGBUILD
index 4f4317ffc5..f63991e6f1 100644
--- a/mingw-w64-libtimidity/PKGBUILD
+++ b/mingw-w64-libtimidity/PKGBUILD
@@ -23,9 +23,9 @@ _timidity_cfg=timidity.cfg
 # libao is only needed for make check, therefore disable it surely.
 build() {
   export lt_cv_deplibs_check_method='pass_all'
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  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
 
   # Install license
diff --git a/mingw-w64-libtre/PKGBUILD b/mingw-w64-libtre/PKGBUILD
index 5678b91101..dadb758c6d 100644
--- a/mingw-w64-libtre/PKGBUILD
+++ b/mingw-w64-libtre/PKGBUILD
@@ -33,9 +33,9 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
-  mkdir -p build-${MINGW_CHOST}
-  cd build-${MINGW_CHOST}
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM}
+  cd build-${MSYSTEM}
   ../${_realname}/configure \
     --prefix=${MINGW_PREFIX} \
     --host=${MINGW_CHOST} \
@@ -49,7 +49,7 @@ build() {
 }
 
 package() {
-  cd build-${MINGW_CHOST}
+  cd build-${MSYSTEM}
   make DESTDIR="${pkgdir}" install
   install -Dm644 "${srcdir}/${_realname}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 }
diff --git a/mingw-w64-libutf8proc/PKGBUILD b/mingw-w64-libutf8proc/PKGBUILD
index f7f35f6ddb..a97b2156a9 100644
--- a/mingw-w64-libutf8proc/PKGBUILD
+++ b/mingw-w64-libutf8proc/PKGBUILD
@@ -29,7 +29,7 @@ build() {
     extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
-  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.exe \
@@ -41,7 +41,7 @@ build() {
 
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
 
-  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.exe \
@@ -55,15 +55,15 @@ build() {
 }
 
 #check() {
-#  cd "${srcdir}"/build-${CARCH}
+#  cd "${srcdir}"/build-${MSYSTEM}
 #  make check
 #}
 
 package() {
-  cd "${srcdir}"/build-${CARCH}-static
+  cd "${srcdir}"/build-${MSYSTEM}-static
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install ./
 
-  cd "${srcdir}"/build-${CARCH}-shared
+  cd "${srcdir}"/build-${MSYSTEM}-shared
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install ./
 
   install -Dm644 ${srcdir}/${_basname}-${pkgver}/LICENSE.md ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
diff --git a/mingw-w64-libvorbis/PKGBUILD b/mingw-w64-libvorbis/PKGBUILD
index 7bdc70155a..9265fe8965 100644
--- a/mingw-w64-libvorbis/PKGBUILD
+++ b/mingw-w64-libvorbis/PKGBUILD
@@ -21,9 +21,9 @@ source=(https://downloads.xiph.org/releases/vorbis/${_realname}-${pkgver}.tar.gz
 sha256sums=('0e982409a9c3fc82ee06e08205b1355e5c6aa4c36bca58146ef399621b0ce5ab')
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -36,6 +36,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build-${MINGW_CHOST}
+  cd ${srcdir}/build-${MSYSTEM}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-libxml++/PKGBUILD b/mingw-w64-libxml++/PKGBUILD
index 36f1f714cf..afa7619c62 100644
--- a/mingw-w64-libxml++/PKGBUILD
+++ b/mingw-w64-libxml++/PKGBUILD
@@ -30,9 +30,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   meson \
@@ -47,7 +47,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"
diff --git a/mingw-w64-libxml++2.6/PKGBUILD b/mingw-w64-libxml++2.6/PKGBUILD
index 5aa960d66f..179ddbef41 100644
--- a/mingw-w64-libxml++2.6/PKGBUILD
+++ b/mingw-w64-libxml++2.6/PKGBUILD
@@ -29,9 +29,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   meson \
@@ -45,7 +45,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}2.6/COPYING"
diff --git a/mingw-w64-lua51/PKGBUILD b/mingw-w64-lua51/PKGBUILD
index 67e3ac6b0d..e959f0824e 100644
--- a/mingw-w64-lua51/PKGBUILD
+++ b/mingw-w64-lua51/PKGBUILD
@@ -44,9 +44,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${CARCH}" ]] && rm -rf "${srcdir}/build-${CARCH}"
-  cp -rf "${srcdir}/lua-${pkgver}" "${srcdir}/build-${CARCH}"
-  cd "${srcdir}/build-${CARCH}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  cp -rf "${srcdir}/lua-${pkgver}" "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
   sed -e 's:llua:llua5.1:' \
     -e 's:/include:/include/lua5.1:' \
     -e "s:/usr/local:${MINGW_PREFIX}:" \
@@ -61,7 +61,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make \
     TO_BIN="lua5.1.exe luac5.1.exe lua51.dll" \
     TO_LIB="liblua5.1.a liblua5.1.dll.a" \
diff --git a/mingw-w64-lua53/PKGBUILD b/mingw-w64-lua53/PKGBUILD
index cc87c0908e..9e5edb4483 100644
--- a/mingw-w64-lua53/PKGBUILD
+++ b/mingw-w64-lua53/PKGBUILD
@@ -49,9 +49,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${CARCH}" ]] && rm -rf "${srcdir}/build-${CARCH}"
-  cp -rf "${srcdir}/lua-${pkgver}" "${srcdir}/build-${CARCH}"
-  cd "${srcdir}/build-${CARCH}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  cp -rf "${srcdir}/lua-${pkgver}" "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
   sed -e "s|%VER%|${pkgver%.*}|g;s|%REL%|${pkgver}|g" \
     -e 's:llua:llua5.3:' \
     -e 's:/include:/include/lua5.3:' \
@@ -67,7 +67,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make \
     TO_BIN="lua5.3.exe luac5.3.exe lua53.dll" \
     TO_LIB="liblua5.3.a liblua5.3.dll.a" \
diff --git a/mingw-w64-lzo2/PKGBUILD b/mingw-w64-lzo2/PKGBUILD
index e1c393708c..7dcda78214 100644
--- a/mingw-w64-lzo2/PKGBUILD
+++ b/mingw-w64-lzo2/PKGBUILD
@@ -25,8 +25,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
   ../lzo-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --host=${MINGW_CHOST} \
@@ -38,12 +38,12 @@ build() {
 }
 
 check() {
- cd "${srcdir}/build-${MINGW_CHOST}"
+ cd "${srcdir}/build-${MSYSTEM}"
  make check
  make test
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-mcpp/PKGBUILD b/mingw-w64-mcpp/PKGBUILD
index 38f78d71e1..a26d7481f1 100644
--- a/mingw-w64-mcpp/PKGBUILD
+++ b/mingw-w64-mcpp/PKGBUILD
@@ -19,9 +19,9 @@ source=("https://downloads.sourceforge.net/mcpp/${_realname}-${pkgver}.tar.gz")
 sha256sums=('3b9b4421888519876c4fc68ade324a3bbd81ceeb7092ecdbbc2055099fcb8864')
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -32,6 +32,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-md4c/PKGBUILD b/mingw-w64-md4c/PKGBUILD
index 9b56353b2e..65c59849e5 100644
--- a/mingw-w64-md4c/PKGBUILD
+++ b/mingw-w64-md4c/PKGBUILD
@@ -33,7 +33,7 @@ build() {
       extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
-  dir_shared="${srcdir}/build-${CARCH}-shared"
+  dir_shared="${srcdir}/build-${MSYSTEM}-shared"
   [[ -d "${dir_shared}" ]] && rm -rf "${dir_shared}"
   mkdir -p "${dir_shared}" && cd "${dir_shared}"
 
@@ -47,7 +47,7 @@ build() {
 
   ninja
 
-  dir_static="${srcdir}/build-${CARCH}-static"
+  dir_static="${srcdir}/build-${MSYSTEM}-static"
   [[ -d "${dir_static}" ]] && rm -rf "${dir_static}"
   mkdir -p "${dir_static}" && cd "${dir_static}"
 
@@ -63,8 +63,8 @@ build() {
 }
 
 package() {
-  dir_shared="${srcdir}/build-${CARCH}-shared"
-  dir_static="${srcdir}/build-${CARCH}-static"
+  dir_shared="${srcdir}/build-${MSYSTEM}-shared"
+  dir_static="${srcdir}/build-${MSYSTEM}-static"
 
   cd "${dir_shared}"
   DESTDIR="${pkgdir}" ninja install
diff --git a/mingw-w64-meanwhile/PKGBUILD b/mingw-w64-meanwhile/PKGBUILD
index 9747bdc206..34db69fb46 100644
--- a/mingw-w64-meanwhile/PKGBUILD
+++ b/mingw-w64-meanwhile/PKGBUILD
@@ -34,8 +34,8 @@ prepare() {
 
 }
 build() {
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
   #CFLAGS+=" -fno-stack-protector --param=ssp-buffer-size=4"
   #CXXFLAGS+=" -fno-stack-protector --param=ssp-buffer-size=4"
   export lt_cv_deplibs_check_method='pass_all'
@@ -53,7 +53,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"
 }
diff --git a/mingw-w64-mhook/PKGBUILD b/mingw-w64-mhook/PKGBUILD
index 6b78a7473b..89a0d78c15 100644
--- a/mingw-w64-mhook/PKGBUILD
+++ b/mingw-w64-mhook/PKGBUILD
@@ -31,7 +31,7 @@ prepare() {
 
 build() {
   cd "${srcdir}"
-  mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
@@ -45,12 +45,12 @@ build() {
 
 check()
 {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   ./mhook-tests
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   mkdir -p ${pkgdir}${MINGW_PREFIX}/lib/
   mkdir -p ${pkgdir}${MINGW_PREFIX}/include/
diff --git a/mingw-w64-mono/bootstrap/PKGBUILD b/mingw-w64-mono/bootstrap/PKGBUILD
index d43d6aac5d..c7c87e9a79 100644
--- a/mingw-w64-mono/bootstrap/PKGBUILD
+++ b/mingw-w64-mono/bootstrap/PKGBUILD
@@ -107,9 +107,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
-  cp -R ${srcdir}/${_realname}/. "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
+  cp -R ${srcdir}/${_realname}/. "${srcdir}"/build-${MSYSTEM}
   ./configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -130,7 +130,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make DESTDIR="${pkgdir}" install
   make -C mcs/jay DESTDIR="${pkgdir}" prefix=${MINGW_PREFIX} install
   
diff --git a/mingw-w64-mpdecimal/PKGBUILD b/mingw-w64-mpdecimal/PKGBUILD
index d1075da718..b457a0ac6f 100644
--- a/mingw-w64-mpdecimal/PKGBUILD
+++ b/mingw-w64-mpdecimal/PKGBUILD
@@ -23,9 +23,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  cp -R "$srcdir/${_realname}-${pkgver}" "${srcdir}"/build-${CARCH}
-  cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  cp -R "$srcdir/${_realname}-${pkgver}" "${srcdir}"/build-${MSYSTEM}
+  cd "${srcdir}"/build-${MSYSTEM}
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -36,11 +36,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}"
 }
diff --git a/mingw-w64-mtex2MML/PKGBUILD b/mingw-w64-mtex2MML/PKGBUILD
index 644224295f..47da595c1e 100644
--- a/mingw-w64-mtex2MML/PKGBUILD
+++ b/mingw-w64-mtex2MML/PKGBUILD
@@ -29,9 +29,9 @@ prepare() {
 }
 
 build() {
-  rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   CFLAGS+=" -Wno-strict-prototypes"
 
@@ -53,6 +53,6 @@ build() {
 # }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" -j1 install
 }
diff --git a/mingw-w64-nanodbc/PKGBUILD b/mingw-w64-nanodbc/PKGBUILD
index 4e8427578b..d5bc149353 100644
--- a/mingw-w64-nanodbc/PKGBUILD
+++ b/mingw-w64-nanodbc/PKGBUILD
@@ -53,7 +53,7 @@ build() {
 #    - MySQL ODBC 5.3 Unicode Driver 32-bit (version 5.03.04.00)
 #    - MySQL ODBC 5.3 Unicode Driver 64-bit (version 5.03.04.00)
 #
-#  cd "${srcdir}/build-${MINGW_CHOST}"
+#  cd "${srcdir}/build-${MSYSTEM}"
 #  export NANODBC_TEST_CONNSTR=`cat ../../connection_string.txt`
 #  SAVED_PATH=${PATH}
 #  PATH=`pwd`:${PATH}
diff --git a/mingw-w64-nanovg/PKGBUILD b/mingw-w64-nanovg/PKGBUILD
index 5d7aa67632..d374724e43 100644
--- a/mingw-w64-nanovg/PKGBUILD
+++ b/mingw-w64-nanovg/PKGBUILD
@@ -35,19 +35,19 @@ pkgver() {
 
 build() {
   cd "${srcdir}"
-  rm -rf "${MINGW_CHOST}" || true
-  cp -rf "${srcdir}/${_realname}" "${srcdir}/${MINGW_CHOST}"
-  cd "${srcdir}/${MINGW_CHOST}"
+  rm -rf "${MSYSTEM}" || true
+  cp -rf "${srcdir}/${_realname}" "${srcdir}/${MSYSTEM}"
+  cd "${srcdir}/${MSYSTEM}"
   premake4 gmake --os=windows cc=cc
   cd build
   make config=${_ctype} nanovg
 }
 
 package() {
-  install -v -Dm644 "${srcdir}/$MINGW_CHOST/build/libnanovg.a" "${pkgdir}${MINGW_PREFIX}/lib/libnanovg.a" || exit 1
-  install -v -Dm644 "${srcdir}/$MINGW_CHOST/LICENSE.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/$_realname/LICENSE.txt" || exit 1
-  install -v -Dm644 "${srcdir}/$MINGW_CHOST/src/nanovg.h" "${pkgdir}${MINGW_PREFIX}/include/nanovg/nanovg.h" || exit 1
-  install -v -Dm644 "${srcdir}/$MINGW_CHOST/src/nanovg_gl.h" "${pkgdir}${MINGW_PREFIX}/include/nanovg/nanovg_gl.h" || exit 1
-  install -v -Dm644 "${srcdir}/$MINGW_CHOST/src/nanovg_gl_utils.h" "${pkgdir}${MINGW_PREFIX}/include/nanovg/nanovg_gl_utils.h" || exit 1
-  install -v -Dm644 "${srcdir}/$MINGW_CHOST/src/fontstash.h" "${pkgdir}${MINGW_PREFIX}/include/nanovg/fontstash.h" || exit 1
+  install -v -Dm644 "${srcdir}/$MSYSTEM/build/libnanovg.a" "${pkgdir}${MINGW_PREFIX}/lib/libnanovg.a" || exit 1
+  install -v -Dm644 "${srcdir}/$MSYSTEM/LICENSE.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/$_realname/LICENSE.txt" || exit 1
+  install -v -Dm644 "${srcdir}/$MSYSTEM/src/nanovg.h" "${pkgdir}${MINGW_PREFIX}/include/nanovg/nanovg.h" || exit 1
+  install -v -Dm644 "${srcdir}/$MSYSTEM/src/nanovg_gl.h" "${pkgdir}${MINGW_PREFIX}/include/nanovg/nanovg_gl.h" || exit 1
+  install -v -Dm644 "${srcdir}/$MSYSTEM/src/nanovg_gl_utils.h" "${pkgdir}${MINGW_PREFIX}/include/nanovg/nanovg_gl_utils.h" || exit 1
+  install -v -Dm644 "${srcdir}/$MSYSTEM/src/fontstash.h" "${pkgdir}${MINGW_PREFIX}/include/nanovg/fontstash.h" || exit 1
 }
diff --git a/mingw-w64-nasm/PKGBUILD b/mingw-w64-nasm/PKGBUILD
index 281c2b2108..02990a7eca 100644
--- a/mingw-w64-nasm/PKGBUILD
+++ b/mingw-w64-nasm/PKGBUILD
@@ -20,9 +20,9 @@ source=(https://www.nasm.us/pub/nasm/releasebuilds/${pkgver}/${_realname}-${pkgv
 sha256sums=('1412a1c760bbd05db026b6c0d1657affd6631cd0a63cddb6f73cc6d4aa616148')
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  cp -rf ${srcdir}/${_realname}-${pkgver} ${srcdir}/build-${MINGW_CHOST}
-  cd ${srcdir}/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  cp -rf ${srcdir}/${_realname}-${pkgver} ${srcdir}/build-${MSYSTEM}
+  cd ${srcdir}/build-${MSYSTEM}
   ./configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -32,7 +32,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build-${MINGW_CHOST}
+  cd ${srcdir}/build-${MSYSTEM}
   make DESTDIR="${pkgdir}" install
   install -Dm644 ${srcdir}/${_realname}-${pkgver}/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 }
diff --git a/mingw-w64-newton-dynamics/PKGBUILD b/mingw-w64-newton-dynamics/PKGBUILD
index 20fc096f49..8d48fff249 100644
--- a/mingw-w64-newton-dynamics/PKGBUILD
+++ b/mingw-w64-newton-dynamics/PKGBUILD
@@ -33,8 +33,8 @@ prepare() {
 
 build() {
   #Static Build
-  [[ -d "${srcdir}/build-${MINGW_CHOST}-static" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}-static"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}-static" && cd "${srcdir}/build-${MINGW_CHOST}-static"
+  [[ -d "${srcdir}/build-${MSYSTEM}-static" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-static"
+  mkdir -p "${srcdir}/build-${MSYSTEM}-static" && cd "${srcdir}/build-${MSYSTEM}-static"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     ${MINGW_PREFIX}/bin/cmake \
@@ -51,8 +51,8 @@ build() {
     ${MINGW_PREFIX}/bin/cmake --build .
 
   #Shared Build
-  [[ -d "${srcdir}/build-${MINGW_CHOST}-shared" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}-shared"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}-shared" && cd "${srcdir}/build-${MINGW_CHOST}-shared"
+  [[ -d "${srcdir}/build-${MSYSTEM}-shared" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-shared"
+  mkdir -p "${srcdir}/build-${MSYSTEM}-shared" && cd "${srcdir}/build-${MSYSTEM}-shared"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     ${MINGW_PREFIX}/bin/cmake \
@@ -73,10 +73,10 @@ build() {
 
 package() {
   #Static Install
-  cd "${srcdir}/build-${MINGW_CHOST}-static"
+  cd "${srcdir}/build-${MSYSTEM}-static"
   DESTDIR=${pkgdir} cmake --build . --target install
   
   #Shared Install
-  cd "${srcdir}/build-${MINGW_CHOST}-shared"
+  cd "${srcdir}/build-${MSYSTEM}-shared"
   DESTDIR=${pkgdir} cmake --build . --target install
 }
diff --git a/mingw-w64-notepad++/PKGBUILD b/mingw-w64-notepad++/PKGBUILD
index 862d079bcb..7eb68b037b 100644
--- a/mingw-w64-notepad++/PKGBUILD
+++ b/mingw-w64-notepad++/PKGBUILD
@@ -43,7 +43,7 @@ build() {
 package() {
   SRC_MSYS="${srcdir}"
   SRC_NPP="${srcdir}"/notepad-plus-plus-${pkgver}
-  BIN="${srcdir}"/build-${MSYSTEM}/bin.${MSYSTEM_CARCH}
+  BIN="${srcdir}"/build-${MSYSTEM}/bin.${CARCH}
   [ -d "$BIN" ] || BIN=${BIN}-debug
 
   PKG_BIN="${pkgdir}"/${MINGW_PREFIX}/bin
diff --git a/mingw-w64-npth/PKGBUILD b/mingw-w64-npth/PKGBUILD
index 72720baf8a..3747b95117 100644
--- a/mingw-w64-npth/PKGBUILD
+++ b/mingw-w64-npth/PKGBUILD
@@ -31,8 +31,8 @@ prepare() {
 }
 
 build() {
-  [ -d ${srcdir}/build-${MINGW_CHOST} ] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [ -d ${srcdir}/build-${MSYSTEM} ] && rm -rf ${srcdir}/build-${MSYSTEM}
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
       --prefix=${MINGW_PREFIX} \
@@ -44,11 +44,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 -j1 DESTDIR=${pkgdir} install
 }
diff --git a/mingw-w64-ode/PKGBUILD b/mingw-w64-ode/PKGBUILD
index 940759929f..33200d7aaa 100644
--- a/mingw-w64-ode/PKGBUILD
+++ b/mingw-w64-ode/PKGBUILD
@@ -29,8 +29,8 @@ prepare() {
 
 build() {
   cd "${srcdir}"/${_realname}-${pkgver}
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   declare -a extra_config
   if check_option "debug" "n"; then
@@ -51,13 +51,13 @@ build() {
 }
 
 check() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
 
   ${MINGW_PREFIX}/bin/ctest
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
 
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build . --target install
 
diff --git a/mingw-w64-ogre3d/PKGBUILD b/mingw-w64-ogre3d/PKGBUILD
index 76a9976c05..e59e573d97 100644
--- a/mingw-w64-ogre3d/PKGBUILD
+++ b/mingw-w64-ogre3d/PKGBUILD
@@ -117,7 +117,7 @@ build() {
     -DOGRE_INSTALL_SAMPLES=ON \
     -DOGRE_BUILD_TESTS=OFF \
     -DOGRE_CONFIG_FILESYSTEM_UNICODE=ON \
-    $([[ ${MSYSTEM_CARCH} == aarch64 ]] && echo "-DOGRE_BUILD_RENDERSYSTEM_D3D9=OFF") \
+    $([[ ${CARCH} == aarch64 ]] && echo "-DOGRE_BUILD_RENDERSYSTEM_D3D9=OFF") \
     -DOGRE_BUILD_TESTS=OFF \
     -DOGRE_INSTALL_PDB=OFF \
     -DOGRE_MEDIA_PATH=share/OGRE/Media \
diff --git a/mingw-w64-onigmo/PKGBUILD b/mingw-w64-onigmo/PKGBUILD
index 0f17c3de0e..a423f258b0 100644
--- a/mingw-w64-onigmo/PKGBUILD
+++ b/mingw-w64-onigmo/PKGBUILD
@@ -23,9 +23,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
       --prefix=${MINGW_PREFIX} \
@@ -39,6 +39,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build-${MINGW_CHOST}
+  cd ${srcdir}/build-${MSYSTEM}
   make install DESTDIR="${pkgdir}"
 }
diff --git a/mingw-w64-opencore-amr/PKGBUILD b/mingw-w64-opencore-amr/PKGBUILD
index f2ebaa7553..997c21ac95 100644
--- a/mingw-w64-opencore-amr/PKGBUILD
+++ b/mingw-w64-opencore-amr/PKGBUILD
@@ -20,9 +20,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -34,11 +34,11 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make test
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-openh264/PKGBUILD b/mingw-w64-openh264/PKGBUILD
index 08e641cffb..9e8c26b919 100644
--- a/mingw-w64-openh264/PKGBUILD
+++ b/mingw-w64-openh264/PKGBUILD
@@ -16,7 +16,7 @@ msys2_references=(
 license=('spdx:BSD-2-Clause')
 makedepends=(
   "${MINGW_PACKAGE_PREFIX}-cc"
-   $([[ ${MSYSTEM_CARCH} == aarch64 ]] || echo "${MINGW_PACKAGE_PREFIX}-nasm")
+   $([[ ${CARCH} == aarch64 ]] || echo "${MINGW_PACKAGE_PREFIX}-nasm")
   "${MINGW_PACKAGE_PREFIX}-meson"
   "${MINGW_PACKAGE_PREFIX}-ninja"
   "${MINGW_PACKAGE_PREFIX}-pkgconf"
diff --git a/mingw-w64-optipng/PKGBUILD b/mingw-w64-optipng/PKGBUILD
index ba291e41f7..f72ebd0e95 100644
--- a/mingw-w64-optipng/PKGBUILD
+++ b/mingw-w64-optipng/PKGBUILD
@@ -28,9 +28,9 @@ prepare() {
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
-  cp -R "${srcdir}"/${_realname}-${pkgver}/* "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
+  cp -R "${srcdir}"/${_realname}-${pkgver}/* "${srcdir}"/build-${MSYSTEM}
   ./configure \
     --prefix=${MINGW_PREFIX} \
     --with-system-libpng \
@@ -40,7 +40,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make prefix="${pkgdir}${MINGW_PREFIX}" mandir="${pkgdir}${MINGW_PREFIX}/share/man" install
 
   # Install license
diff --git a/mingw-w64-opus-tools/PKGBUILD b/mingw-w64-opus-tools/PKGBUILD
index c9fc7d6d7c..a6aee66b32 100644
--- a/mingw-w64-opus-tools/PKGBUILD
+++ b/mingw-w64-opus-tools/PKGBUILD
@@ -22,9 +22,9 @@ source=(https://downloads.xiph.org/releases/opus/${_realname}-${pkgver}.tar.gz)
 sha256sums=('b4e56cb00d3e509acfba9a9b627ffd8273b876b4e2408642259f6da28fa0ff86')
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -36,6 +36,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-orc/PKGBUILD b/mingw-w64-orc/PKGBUILD
index 6961138749..6ed79a2b80 100644
--- a/mingw-w64-orc/PKGBUILD
+++ b/mingw-w64-orc/PKGBUILD
@@ -23,9 +23,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   ${MINGW_PREFIX}/bin/meson setup \
@@ -39,7 +39,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   DESTDIR="${pkgdir}" meson install
 
diff --git a/mingw-w64-p11-kit/PKGBUILD b/mingw-w64-p11-kit/PKGBUILD
index 8484474d81..aa5c4b22e6 100644
--- a/mingw-w64-p11-kit/PKGBUILD
+++ b/mingw-w64-p11-kit/PKGBUILD
@@ -79,8 +79,8 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   # PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/share/pkgconfig" \
   # ${MINGW_PREFIX}/bin/meson \
@@ -113,7 +113,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="-DBINDIR=;-DDATA_DIR=;-DP11_SYSTEM_CONFIG_FILE=;-DP11_SYSTEM_CONFIG_MODULES=;-DP11_PACKAGE_CONFIG_MODULES=;-DP11_MODULE_PATH=;-DDATADIR=;-DSYSCONFDIR=;-DPRIVATEDIR=;-DP11_USER_CONFIG_FILE=;-DP11_USER_CONFIG_MODULES=" \
     make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-parsec/PKGBUILD b/mingw-w64-parsec/PKGBUILD
index 738607d051..ce71b8f2a8 100644
--- a/mingw-w64-parsec/PKGBUILD
+++ b/mingw-w64-parsec/PKGBUILD
@@ -26,8 +26,8 @@ prepare() {
 
 build() {
   #Static Build
-  [[ -d "${srcdir}/build-${MINGW_CHOST}-static" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}-static"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}-static" && cd "${srcdir}/build-${MINGW_CHOST}-static"
+  [[ -d "${srcdir}/build-${MSYSTEM}-static" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-static"
+  mkdir -p "${srcdir}/build-${MSYSTEM}-static" && cd "${srcdir}/build-${MSYSTEM}-static"
 
   # for asprintf
   CFLAGS+=" -D_GNU_SOURCE"
@@ -50,7 +50,7 @@ build() {
 
 package() {
   #Static Install
-  cd "${srcdir}/build-${MINGW_CHOST}-static"
+  cd "${srcdir}/build-${MSYSTEM}-static"
   DESTDIR=${pkgdir} cmake --build ./ --target install
   install -Dm644 ${srcdir}/${_realname}-${pkgver}/License.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
 
diff --git a/mingw-w64-pastix/PKGBUILD b/mingw-w64-pastix/PKGBUILD
index 74516397f3..b263b30859 100644
--- a/mingw-w64-pastix/PKGBUILD
+++ b/mingw-w64-pastix/PKGBUILD
@@ -55,8 +55,8 @@ build() {
   fi
 
   #Static Build
-  [[ -d "${srcdir}/build-${MINGW_CHOST}-static" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}-static"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}-static" && cd "${srcdir}/build-${MINGW_CHOST}-static"
+  [[ -d "${srcdir}/build-${MSYSTEM}-static" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-static"
+  mkdir -p "${srcdir}/build-${MSYSTEM}-static" && cd "${srcdir}/build-${MSYSTEM}-static"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     ${MINGW_PREFIX}/bin/cmake \
@@ -80,8 +80,8 @@ build() {
   ${MINGW_PREFIX}/bin/cmake --build .
 
   #Shared Build
-  [[ -d "${srcdir}/build-${MINGW_CHOST}-shared" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}-shared"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}-shared" && cd "${srcdir}/build-${MINGW_CHOST}-shared"
+  [[ -d "${srcdir}/build-${MSYSTEM}-shared" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-shared"
+  mkdir -p "${srcdir}/build-${MSYSTEM}-shared" && cd "${srcdir}/build-${MSYSTEM}-shared"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     ${MINGW_PREFIX}/bin/cmake \
@@ -107,20 +107,20 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/build-${MINGW_CHOST}-shared"
+  cd "${srcdir}/build-${MSYSTEM}-shared"
   ${MINGW_PREFIX}/bin/ctest
 
-  cd "${srcdir}/build-${MINGW_CHOST}-static"
+  cd "${srcdir}/build-${MSYSTEM}-static"
   ${MINGW_PREFIX}/bin/ctest
 }
 
 package() {
   #Static Install
-  cd "${srcdir}/build-${MINGW_CHOST}-static"
+  cd "${srcdir}/build-${MSYSTEM}-static"
   DESTDIR="${pkgdir}" cmake --install .
 
   #Shared Install
-  cd "${srcdir}/build-${MINGW_CHOST}-shared"
+  cd "${srcdir}/build-${MSYSTEM}-shared"
   DESTDIR="${pkgdir}" cmake --install .
 
   #License
diff --git a/mingw-w64-pcre/PKGBUILD b/mingw-w64-pcre/PKGBUILD
index 3ab65ef22a..c9fff6d9cc 100644
--- a/mingw-w64-pcre/PKGBUILD
+++ b/mingw-w64-pcre/PKGBUILD
@@ -31,8 +31,8 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   "${srcdir}"/${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -52,12 +52,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
 
   # License files
diff --git a/mingw-w64-pikchr/PKGBUILD b/mingw-w64-pikchr/PKGBUILD
index 8072ded436..45c474d228 100644
--- a/mingw-w64-pikchr/PKGBUILD
+++ b/mingw-w64-pikchr/PKGBUILD
@@ -20,16 +20,16 @@ sha256sums=('138fcd51ac42010b1fe9f8f7aa9721644bd7ef9a02e71c933bb9a415ff510b54'
             'bb87a8beb7b525149c69a23029a6957d6d7a72751214fac7a1e4a628ac5cd555')
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  cp -r "${srcdir}/${_realname}-${_pkgsha}" "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  cp -r "${srcdir}/${_realname}-${_pkgsha}" "${srcdir}/build-${MSYSTEM}"
 
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   make CC="${MINGW_PREFIX}/bin/cc.exe"
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   mkdir -p "${pkgdir}${MINGW_PREFIX}/bin"
   cp pikchr.exe "${pkgdir}${MINGW_PREFIX}/bin/"
diff --git a/mingw-w64-pngcrush/PKGBUILD b/mingw-w64-pngcrush/PKGBUILD
index 5cd55bd82f..3f63dd18f1 100644
--- a/mingw-w64-pngcrush/PKGBUILD
+++ b/mingw-w64-pngcrush/PKGBUILD
@@ -21,16 +21,16 @@ sha256sums=('fed0aaf5c098aa8c7f78c75365cd18d7341417326ecbdba547876b7b4f3df4be'
             '5628338f1b1c711b2b2e82d14124bc3001b37216a66f00b18d0b3b9c7e016720')
 
 prepare() {
-  mv "${srcdir}/${_realname}-${pkgver}-nolib" "${srcdir}/${_realname}-build-${MINGW_CHOST}"
+  mv "${srcdir}/${_realname}-${pkgver}-nolib" "${srcdir}/${_realname}-build-${MSYSTEM}"
 }
 
 build() {
-  cd "${srcdir}/${_realname}-build-${MINGW_CHOST}"
+  cd "${srcdir}/${_realname}-build-${MSYSTEM}"
   CFLAGS+=" -DPNGCRUSH_COUNT_COLORS" make CC="$CC" LD="$CC"
 }
 
 package() {
-  install -Dm755 ${srcdir}/${_realname}-build-${MINGW_CHOST}/${_realname} \
+  install -Dm755 ${srcdir}/${_realname}-build-${MSYSTEM}/${_realname} \
     "${pkgdir}"${MINGW_PREFIX}/bin/${_realname}
   install -Dm644 LICENSE \
     "$pkgdir"${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
diff --git a/mingw-w64-pngquant/PKGBUILD b/mingw-w64-pngquant/PKGBUILD
index 6830e339d8..2e1365c0cb 100644
--- a/mingw-w64-pngquant/PKGBUILD
+++ b/mingw-w64-pngquant/PKGBUILD
@@ -27,9 +27,9 @@ prepare() {
 
 build() {
   cd "$srcdir"/${_realname}-${pkgver}
-  rm -rf "${srcdir}"/build-${CARCH} || true
-  cp -r "${srcdir}/${_realname}-${pkgver}" "${srcdir}/build-${CARCH}"
-  cd "${srcdir}"/build-${CARCH}
+  rm -rf "${srcdir}"/build-${MSYSTEM} || true
+  cp -r "${srcdir}/${_realname}-${pkgver}" "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}"/build-${MSYSTEM}
   msg2 "PWD $(pwd)"
   if [ "${CARCH}" = "i686" ]; then
     SSE="--disable-sse"
@@ -43,7 +43,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
 
   install -dm 0755 ${pkgdir}${MINGW_PREFIX}/bin
   install -dm 0755 ${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}
diff --git a/mingw-w64-portablexdr/PKGBUILD b/mingw-w64-portablexdr/PKGBUILD
index 4be1d5284e..8f336b4cec 100644
--- a/mingw-w64-portablexdr/PKGBUILD
+++ b/mingw-w64-portablexdr/PKGBUILD
@@ -27,9 +27,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "$srcdir/build-${MINGW_CHOST}" ]] && rm -rf "$srcdir/build-${MINGW_CHOST}"
-  mkdir "$srcdir/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "$srcdir/build-${MSYSTEM}" ]] && rm -rf "$srcdir/build-${MSYSTEM}"
+  mkdir "$srcdir/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}/configure \
       --prefix=${MINGW_PREFIX} \
@@ -42,6 +42,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-portaudio/PKGBUILD b/mingw-w64-portaudio/PKGBUILD
index a86f288d40..786fb88314 100644
--- a/mingw-w64-portaudio/PKGBUILD
+++ b/mingw-w64-portaudio/PKGBUILD
@@ -44,9 +44,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   declare -a extra_config
   if check_option "debug" "n"; then
@@ -66,7 +66,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build . --target install
 }
diff --git a/mingw-w64-pqp/PKGBUILD b/mingw-w64-pqp/PKGBUILD
index a15da74160..4ac70f2f36 100644
--- a/mingw-w64-pqp/PKGBUILD
+++ b/mingw-w64-pqp/PKGBUILD
@@ -20,8 +20,8 @@ sha256sums=('ae33a4506d70b68176d4e56d60bcc5760f46cc4e71d5856c02fd82db5026457f')
 
 build() {
   cd "${srcdir}"/PQP-${_commit}
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   declare -a extra_config
   if check_option "debug" "n"; then
@@ -43,7 +43,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
 
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build . --target install
 
diff --git a/mingw-w64-python-aiohttp-cors/PKGBUILD b/mingw-w64-python-aiohttp-cors/PKGBUILD
index 7f9919dfa9..f0e66895df 100644
--- a/mingw-w64-python-aiohttp-cors/PKGBUILD
+++ b/mingw-w64-python-aiohttp-cors/PKGBUILD
@@ -21,18 +21,18 @@ sha256sums=('4d39c6d7100fd9764ed1caf8cebf0eb01bf5e3f24e2e073fda6234bc48b19f5d')
 
 prepare() {  
   cd "$srcdir"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-$pkgver" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-$pkgver" "python-build-${MSYSTEM}"
 }
 
 build() {
-  msg "Python build for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"  
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-asn1crypto/PKGBUILD b/mingw-w64-python-asn1crypto/PKGBUILD
index c814a7c969..3ce144d150 100644
--- a/mingw-w64-python-asn1crypto/PKGBUILD
+++ b/mingw-w64-python-asn1crypto/PKGBUILD
@@ -23,17 +23,17 @@ sha256sums=('c06e6827971891a7c42299eff3f0881d6fbf1ada53f11c5797240a9c0cec6a1c')
 
 prepare() {
   cd ${srcdir}
-  cp -r ${_realname}-${pkgver} python-build-${CARCH}
+  cp -r ${_realname}-${pkgver} python-build-${MSYSTEM}
 }
 
 build() {
-  msg "Python build for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd ${srcdir}/python-build-${CARCH}
+  cd ${srcdir}/python-build-${MSYSTEM}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" --skip-build
 
diff --git a/mingw-w64-python-astor/PKGBUILD b/mingw-w64-python-astor/PKGBUILD
index 87cdfc3fea..a5c2dfc677 100644
--- a/mingw-w64-python-astor/PKGBUILD
+++ b/mingw-w64-python-astor/PKGBUILD
@@ -21,23 +21,23 @@ sha512sums=('8917898e284fb5e5855a05f8e3f1c8925c4128d2a87f67f0334914d4d3c54b53c4f
 
 prepare() {  
   cd "$srcdir"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  msg "Python build for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"  
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   nosetests || warning "https://github.com/berkerpeksag/astor/issues/146"
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-async_generator/PKGBUILD b/mingw-w64-python-async_generator/PKGBUILD
index a2a9672af2..becf7499be 100644
--- a/mingw-w64-python-async_generator/PKGBUILD
+++ b/mingw-w64-python-async_generator/PKGBUILD
@@ -21,23 +21,23 @@ sha256sums=('7b61d78c5bb14fb89e5d67b58755033f234bb411e71924820d5a23e087de4535')
 
 prepare() {  
   cd "$srcdir"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-$pkgver" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-$pkgver" "python-build-${MSYSTEM}"
 }
 
 build() {
-  msg "Python build for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"  
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/py.test
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-asynctest/PKGBUILD b/mingw-w64-python-asynctest/PKGBUILD
index cc9113c936..a3732b1984 100644
--- a/mingw-w64-python-asynctest/PKGBUILD
+++ b/mingw-w64-python-asynctest/PKGBUILD
@@ -19,23 +19,23 @@ source=("https://github.com/Martiusweb/asynctest/archive/v$pkgver.tar.gz")
 sha256sums=('d405738ab51d3b6283144a8425c8859b4cd8ea7e18eb6d203edd66047f00fe49')
 
 prepare() {  
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-$pkgver" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-$pkgver" "python-build-${MSYSTEM}"
 }
 
 build() {
-  msg "Python build for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python -m unittest test || warning "Tests failed"
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-atomicwrites/PKGBUILD b/mingw-w64-python-atomicwrites/PKGBUILD
index 53ff4e02bb..713747c46a 100644
--- a/mingw-w64-python-atomicwrites/PKGBUILD
+++ b/mingw-w64-python-atomicwrites/PKGBUILD
@@ -43,27 +43,27 @@ del_file_exists() {
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
       ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  msg "Python test for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python test for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   PYTHONPATH=build:${PYTHONPATH} ${MINGW_PREFIX}/bin/py.test
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-backcall/PKGBUILD b/mingw-w64-python-backcall/PKGBUILD
index e65a2e201c..24d77962ea 100644
--- a/mingw-w64-python-backcall/PKGBUILD
+++ b/mingw-w64-python-backcall/PKGBUILD
@@ -23,22 +23,22 @@ sha256sums=('5cbdbf27be5e7cfadb448baf0aa95508f91f2bbc6c6437cd9cd06e2a4c215e1e')
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py check
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-bsddb3/PKGBUILD b/mingw-w64-python-bsddb3/PKGBUILD
index 3a286ca140..7600628135 100644
--- a/mingw-w64-python-bsddb3/PKGBUILD
+++ b/mingw-w64-python-bsddb3/PKGBUILD
@@ -37,12 +37,12 @@ prepare() {
   sed -i -e "s|elif os.name == 'nt':|elif os.name == 'FOO':|g" setup{2,3}.py
 
   cd "${srcdir}"
-  rm -rf "python-build-${CARCH}" | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf "python-build-${MSYSTEM}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
 
   CFLAGS+=" -DUNICODE -D_UNICODE -Wno-error=incompatible-pointer-types"
 
@@ -58,7 +58,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=;--install-purelib=;--install-data=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX#\/} --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-cffi/PKGBUILD b/mingw-w64-python-cffi/PKGBUILD
index 04b061e72b..1c44ff8bb0 100644
--- a/mingw-w64-python-cffi/PKGBUILD
+++ b/mingw-w64-python-cffi/PKGBUILD
@@ -26,13 +26,13 @@ sha256sums=('1c39c6016c32bc48dd54561950ebd6836e1670f2ae46128f67cf49e789c52824'
 
 prepare() {
   cd "${srcdir}"
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
-  cd "python-build-${CARCH}"
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
+  cd "python-build-${MSYSTEM}"
   patch -Np1 -i "${srcdir}"/mingw-non-x86.patch
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
 
   # work around gcc errors
   if [[ "${CC}" == "gcc" ]]; then
@@ -44,7 +44,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" --skip-build
diff --git a/mingw-w64-python-characteristic/PKGBUILD b/mingw-w64-python-characteristic/PKGBUILD
index af5b425dd8..6c59ccc84f 100644
--- a/mingw-w64-python-characteristic/PKGBUILD
+++ b/mingw-w64-python-characteristic/PKGBUILD
@@ -23,17 +23,17 @@ sha256sums=('ded68d4e424115ed44e5c83c2a901a0b6157a959079d7591d92106ffd3ada380')
 
 prepare() {
   cd "${srcdir}"
-  rm -rf "python-build-${CARCH}" | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf "python-build-${MSYSTEM}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" --skip-build
diff --git a/mingw-w64-python-commonmark/PKGBUILD b/mingw-w64-python-commonmark/PKGBUILD
index d53ea43abd..b9b70243db 100644
--- a/mingw-w64-python-commonmark/PKGBUILD
+++ b/mingw-w64-python-commonmark/PKGBUILD
@@ -20,19 +20,19 @@ sha256sums=('452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60')
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  msg "Python build for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-contextlib2/PKGBUILD b/mingw-w64-python-contextlib2/PKGBUILD
index 71976de375..e2aee3dba8 100644
--- a/mingw-w64-python-contextlib2/PKGBUILD
+++ b/mingw-w64-python-contextlib2/PKGBUILD
@@ -23,8 +23,8 @@ sha512sums=('a85cafaaf66c7c6a59a4e9ac757941b1a98c17e5a49e41573dc759fafbbf17928a2
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
@@ -32,13 +32,13 @@ prepare() {
 }
 
 build() {
-  msg "Python build for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"  
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" --skip-build
 
diff --git a/mingw-w64-python-crcmod/PKGBUILD b/mingw-w64-python-crcmod/PKGBUILD
index 8997f7e16f..1168230537 100644
--- a/mingw-w64-python-crcmod/PKGBUILD
+++ b/mingw-w64-python-crcmod/PKGBUILD
@@ -23,16 +23,16 @@ sha256sums=('dc7051a0db5f2bd48665a990d3ec1cc305a466a77358ca4492826f41f283601e')
 
 prepare() {
   cd "${srcdir}"
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-python-cssselect/PKGBUILD b/mingw-w64-python-cssselect/PKGBUILD
index 714fd584af..1fe9c57d28 100644
--- a/mingw-w64-python-cssselect/PKGBUILD
+++ b/mingw-w64-python-cssselect/PKGBUILD
@@ -25,18 +25,18 @@ prepare() {
   cd "${srcdir}"
   sed -e "s|# coding: utf8|# -*- encoding:utf-8 -*-|g" -i ${_realname}-${pkgver}/setup.py
 
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  msg "Python build for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"  
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=;--install-purelib=;--install-data=" \
     ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" --optimize=1
   install -D -m644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
diff --git a/mingw-w64-python-d2to1/PKGBUILD b/mingw-w64-python-d2to1/PKGBUILD
index b7c0013bc0..c0583c68b9 100644
--- a/mingw-w64-python-d2to1/PKGBUILD
+++ b/mingw-w64-python-d2to1/PKGBUILD
@@ -18,21 +18,21 @@ sha256sums=('49ef2d16862b3efdc81fc5c32eac373b984945cde5fc02bb01a0a11ff03dd825')
 
 prepare() {
   cd "${srcdir}"
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/nosetests
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-python-distutils-extra/PKGBUILD b/mingw-w64-python-distutils-extra/PKGBUILD
index 9595ba3a21..f4fd2997aa 100644
--- a/mingw-w64-python-distutils-extra/PKGBUILD
+++ b/mingw-w64-python-distutils-extra/PKGBUILD
@@ -27,24 +27,24 @@ sha256sums=('723f24f4d65fc8d99b33a002fbbb3771d4cc9d664c97085bf37f3997ae8063af'
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py test
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix="${MINGW_PREFIX}" --root="${pkgdir}" --skip-build
 }
diff --git a/mingw-w64-python-editor/PKGBUILD b/mingw-w64-python-editor/PKGBUILD
index b745e2987d..8803d84a9e 100644
--- a/mingw-w64-python-editor/PKGBUILD
+++ b/mingw-w64-python-editor/PKGBUILD
@@ -26,8 +26,8 @@ sha256sums=('61a4758919668b8ffe5eb389a86a4c2e8c2f789c02b9c6aee0ddf3c4ebfe3fd3')
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python-build-${CARCH} | true
-  cp -r "python-${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "python-${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
@@ -35,17 +35,17 @@ prepare() {
 
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py check
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-python-extras/PKGBUILD b/mingw-w64-python-extras/PKGBUILD
index f66dfaf370..2d546b31e4 100644
--- a/mingw-w64-python-extras/PKGBUILD
+++ b/mingw-w64-python-extras/PKGBUILD
@@ -44,27 +44,27 @@ del_file_exists() {
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  msg "Python build for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"  
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  msg "Python test for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python test for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python -m testtools.run extras.tests.test_suite
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-fprettify/PKGBUILD b/mingw-w64-python-fprettify/PKGBUILD
index cd4ced0146..c444ea069f 100644
--- a/mingw-w64-python-fprettify/PKGBUILD
+++ b/mingw-w64-python-fprettify/PKGBUILD
@@ -36,19 +36,19 @@ prepare() {
 #  done
   unzip "${srcdir}/${_realname}-${pkgver}.zip"
 
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  msg "Python build for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
       ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
     ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" --optimize=1 --skip-build
   for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*-script.py; do
diff --git a/mingw-w64-python-func-timeout/PKGBUILD b/mingw-w64-python-func-timeout/PKGBUILD
index 6c5bbac9e2..5ec5d0d118 100644
--- a/mingw-w64-python-func-timeout/PKGBUILD
+++ b/mingw-w64-python-func-timeout/PKGBUILD
@@ -23,19 +23,19 @@ sha256sums=('74cd3c428ec94f4edfba81f9b2f14904846d5ffccc27c92433b8b5939b5575dd')
 
 prepare() {  
   cd "$srcdir"
-  rm -rf python-build-${CARCH} | true
-  cp -r "$_pyname-$pkgver" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "$_pyname-$pkgver" "python-build-${MSYSTEM}"
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  msg "Python build for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"  
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-funcsigs/PKGBUILD b/mingw-w64-python-funcsigs/PKGBUILD
index 1811f76e55..0357eb4f20 100644
--- a/mingw-w64-python-funcsigs/PKGBUILD
+++ b/mingw-w64-python-funcsigs/PKGBUILD
@@ -25,18 +25,18 @@ prepare() {
   [[ -d ${srcdir}${_realname}-${pkgver} ]] && rm -rf ${srcdir}/${_realname}-${pkgver}
   tar -xzf ${srcdir}/${_realname}-${pkgver}.tar.gz -C ${srcdir} || true
 
-  rm -rf python-build-${CARCH} | true
-  cp -r ${_realname}-${pkgver} python-build-${CARCH}
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r ${_realname}-${pkgver} python-build-${MSYSTEM}
 }
 
 build() {
-  msg "Python build for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd ${srcdir}/python-build-${CARCH}
+  cd ${srcdir}/python-build-${MSYSTEM}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-genty/PKGBUILD b/mingw-w64-python-genty/PKGBUILD
index 7c831b7733..6f98716d44 100644
--- a/mingw-w64-python-genty/PKGBUILD
+++ b/mingw-w64-python-genty/PKGBUILD
@@ -24,17 +24,17 @@ sha256sums=('34fbc16c18dd207b21f15b6dc61b8ae1197057525636ac2f8172cc52071d9f06')
 
 prepare() {
   cd "${srcdir}"
-  rm -rf "python-build-${CARCH}" | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf "python-build-${MSYSTEM}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-python-html5lib/PKGBUILD b/mingw-w64-python-html5lib/PKGBUILD
index 8d2304dae7..98efe445fc 100644
--- a/mingw-w64-python-html5lib/PKGBUILD
+++ b/mingw-w64-python-html5lib/PKGBUILD
@@ -37,25 +37,25 @@ prepare() {
     cp -r "${srcdir}/html5lib-tests-${_test_commit}" html5lib/tests/testdata
   popd
 
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-python-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-python-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  msg2 "Python build for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  msg2 "Python build for ${MSYSTEM}"  
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
   msg2 "Python check for ${CARCH}"
-  cd ${srcdir}/python-build-${CARCH}
+  cd ${srcdir}/python-build-${MSYSTEM}
   ${MINGW_PREFIX}/bin/py.test
 
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-python-httplib2/PKGBUILD b/mingw-w64-python-httplib2/PKGBUILD
index d4e19eae60..fe0287d997 100644
--- a/mingw-w64-python-httplib2/PKGBUILD
+++ b/mingw-w64-python-httplib2/PKGBUILD
@@ -35,17 +35,17 @@ prepare() {
   patch -p1 -i "${srcdir}/cert.patch"
 
   cd "${srcdir}"
-  rm -rf "python-build-${CARCH}" | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf "python-build-${MSYSTEM}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
     ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX#\/} --root="${pkgdir}" --optimize=1
diff --git a/mingw-w64-python-inflection/PKGBUILD b/mingw-w64-python-inflection/PKGBUILD
index 9d8cfd2d5a..9a76156917 100644
--- a/mingw-w64-python-inflection/PKGBUILD
+++ b/mingw-w64-python-inflection/PKGBUILD
@@ -21,18 +21,18 @@ sha256sums=('f9052041a2c7221cf2535fd9ab78915ca87ebcb9ccebfab4a2aa1ee70fc03cb2')
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  msg "Python build for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-intervaltree/PKGBUILD b/mingw-w64-python-intervaltree/PKGBUILD
index 455bdfdcd9..7e052bccb3 100644
--- a/mingw-w64-python-intervaltree/PKGBUILD
+++ b/mingw-w64-python-intervaltree/PKGBUILD
@@ -21,18 +21,18 @@ sha256sums=('d6c1269a7875c98146b0aedbcc1afd7ca8f9f1e8f59c412c853f1173bc6a52b1')
 
 prepare() {  
   cd "$srcdir"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  msg "Python build for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"  
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-iocapture/PKGBUILD b/mingw-w64-python-iocapture/PKGBUILD
index 6d0c7294a5..5d0f1eefee 100644
--- a/mingw-w64-python-iocapture/PKGBUILD
+++ b/mingw-w64-python-iocapture/PKGBUILD
@@ -27,25 +27,25 @@ sha256sums=('57056d1a99a9c584ae2bb23a1aa855292fd2bcc01a8a6ad5467d7ca2e739d31b')
 
 prepare() {
   cd "${srcdir}"
-  rm -rf "python-build-${CARCH}" | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf "python-build-${MSYSTEM}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python -m pytest
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-python-ipython_genutils/PKGBUILD b/mingw-w64-python-ipython_genutils/PKGBUILD
index 0845c87935..be0bd2b66a 100644
--- a/mingw-w64-python-ipython_genutils/PKGBUILD
+++ b/mingw-w64-python-ipython_genutils/PKGBUILD
@@ -23,17 +23,17 @@ sha256sums=('424a6ecb33b8c9a8320f8601c533067ed75b491e4bc31621d6278f288497cb1a')
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1 --skip-build
 }
diff --git a/mingw-w64-python-jdcal/PKGBUILD b/mingw-w64-python-jdcal/PKGBUILD
index 7670b2341d..c175e7f78a 100644
--- a/mingw-w64-python-jdcal/PKGBUILD
+++ b/mingw-w64-python-jdcal/PKGBUILD
@@ -23,17 +23,17 @@ sha256sums=('472872e096eb8df219c23f2689fc336668bdb43d194094b5cc1707e1640acfc8')
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-jmespath/PKGBUILD b/mingw-w64-python-jmespath/PKGBUILD
index 47011dbb25..ceba1741f6 100644
--- a/mingw-w64-python-jmespath/PKGBUILD
+++ b/mingw-w64-python-jmespath/PKGBUILD
@@ -24,23 +24,23 @@ sha256sums=('6a02470b1716ec7a32abe89a873a4795c41c938468225f8a53d860980ec9e3c6')
 
 prepare() {  
   cd "$srcdir"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}.py-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}.py-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  msg "Python build for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"  
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   LC_CTYPE=en_US.utf8 python -m pytest || warning "Tests failed"
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-json-rpc/PKGBUILD b/mingw-w64-python-json-rpc/PKGBUILD
index 6bd0de65e4..5f9f36963a 100644
--- a/mingw-w64-python-json-rpc/PKGBUILD
+++ b/mingw-w64-python-json-rpc/PKGBUILD
@@ -23,17 +23,17 @@ sha256sums=('e6441d56c1dcd54241c937d0a2dcd193bdf0bdc539b5316524713f554b7f85b9')
 
 prepare() {
   cd "${srcdir}"
-  rm -rf "python-build-${CARCH}" | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf "python-build-${MSYSTEM}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-python-ldap3/PKGBUILD b/mingw-w64-python-ldap3/PKGBUILD
index ae4c5ccdc0..fb4880d27f 100644
--- a/mingw-w64-python-ldap3/PKGBUILD
+++ b/mingw-w64-python-ldap3/PKGBUILD
@@ -41,27 +41,27 @@ del_file_exists() {
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  msg "Python build for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  msg "Python test for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python test for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py check
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-lhafile/PKGBUILD b/mingw-w64-python-lhafile/PKGBUILD
index b2fa2c7562..5a9a3e9c34 100644
--- a/mingw-w64-python-lhafile/PKGBUILD
+++ b/mingw-w64-python-lhafile/PKGBUILD
@@ -23,17 +23,17 @@ source=(${_realname}-${pkgver}.tar.gz::https://github.com/FrodeSolheim/python-lh
 sha256sums=('5565641820813c76c74f2199f19f6ee0e3ae1e1c14de1a3a4ea3602f9094cd29')
 
 prepare() {
-  rm -rf "python-build-${CARCH}" | true
-  cp -r "python-${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf "python-build-${MSYSTEM}" | true
+  cp -r "python-${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
     ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-python-mallard-ducktype/PKGBUILD b/mingw-w64-python-mallard-ducktype/PKGBUILD
index a94d5a947f..28855745f3 100644
--- a/mingw-w64-python-mallard-ducktype/PKGBUILD
+++ b/mingw-w64-python-mallard-ducktype/PKGBUILD
@@ -43,27 +43,27 @@ del_file_exists() {
 
 prepare() {
   cd "${srcdir}"
-  rm -rf "python-build-${CARCH}" | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf "python-build-${MSYSTEM}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-    msg "Python build for ${CARCH}"  
-    cd "${srcdir}/python-build-${CARCH}"
+    msg "Python build for ${MSYSTEM}"  
+    cd "${srcdir}/python-build-${MSYSTEM}"
     ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-    msg "Python test for ${CARCH}"
-    cd "${srcdir}/python-build-${CARCH}"
+    msg "Python test for ${MSYSTEM}"
+    cd "${srcdir}/python-build-${MSYSTEM}"
     ${MINGW_PREFIX}/bin/python setup.py test
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-manhole/PKGBUILD b/mingw-w64-python-manhole/PKGBUILD
index 6df754025e..a946bbfa73 100644
--- a/mingw-w64-python-manhole/PKGBUILD
+++ b/mingw-w64-python-manhole/PKGBUILD
@@ -24,18 +24,18 @@ source=("${_realname}-${pkgver}.tar.gz::https://github.com/ionelmc/python-manhol
 sha512sums=('f37d4f401e862fe49b6c59025f62fac15a2f1c0ece4c8418c27ce1cef62723aa47506210ef78ddc7c3219ab2f31019d5b1235e496861b9f7b094a3390a3128bb')
 
 prepare() {
-  rm -rf python-build-${CARCH} || true
-  cp -r "python-${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} || true
+  cp -r "python-${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  msg "Python build for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-markdown-math/PKGBUILD b/mingw-w64-python-markdown-math/PKGBUILD
index 33aaecd158..c253053c8b 100644
--- a/mingw-w64-python-markdown-math/PKGBUILD
+++ b/mingw-w64-python-markdown-math/PKGBUILD
@@ -23,25 +23,25 @@ source=("https://files.pythonhosted.org/packages/source/p/python-${_realname}/py
 sha256sums=('8564212af679fc18d53f38681f16080fcd3d186073f23825c7ce86fadd3e3635')
 
 prepare() {
-  rm -rf "python-build-${CARCH}" | true
-  cp -r "python-${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf "python-build-${MSYSTEM}" | true
+  cp -r "python-${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py test
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-python-mock/PKGBUILD b/mingw-w64-python-mock/PKGBUILD
index a0cbd6fb2a..c7105ef6f1 100644
--- a/mingw-w64-python-mock/PKGBUILD
+++ b/mingw-w64-python-mock/PKGBUILD
@@ -27,11 +27,11 @@ prepare() {
   tar -xzf ${srcdir}/${_realname}-${pkgver}.tar.gz -C ${srcdir} || true
 
   cd "${srcdir}"
-  cp -r ${_realname}-${pkgver} python-build-${CARCH}
+  cp -r ${_realname}-${pkgver} python-build-${MSYSTEM}
 }
 
 package() {
-  cd ${srcdir}/python-build-${CARCH}
+  cd ${srcdir}/python-build-${MSYSTEM}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1
diff --git a/mingw-w64-python-oauth2client/PKGBUILD b/mingw-w64-python-oauth2client/PKGBUILD
index 4cf184302c..98762197be 100644
--- a/mingw-w64-python-oauth2client/PKGBUILD
+++ b/mingw-w64-python-oauth2client/PKGBUILD
@@ -20,18 +20,18 @@ sha256sums=('65a05310e3f16b930454aed7bed619edca8025ba96324c3e9b57dd508f1a014f')
 
 prepare() {  
   cd "$srcdir"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  msg "Python build for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"  
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-oauthlib/PKGBUILD b/mingw-w64-python-oauthlib/PKGBUILD
index 33495e96c1..a98f0c7262 100644
--- a/mingw-w64-python-oauthlib/PKGBUILD
+++ b/mingw-w64-python-oauthlib/PKGBUILD
@@ -22,18 +22,18 @@ sha256sums=('9859c40929662bec5d64f34d01c99e093149682a3f38915dc0655d5a633dd918')
 
 prepare() {  
   cd "$srcdir"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  msg "Python build for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"  
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-ordered-set/PKGBUILD b/mingw-w64-python-ordered-set/PKGBUILD
index df00c3192e..e81a1ea253 100644
--- a/mingw-w64-python-ordered-set/PKGBUILD
+++ b/mingw-w64-python-ordered-set/PKGBUILD
@@ -23,18 +23,18 @@ source=(https://files.pythonhosted.org/packages/source/o/${_realname}/${_realnam
 sha256sums=('694a8e44c87657c59292ede72891eb91d34131f6531463aab3009191c77364a8')
 
 prepare() {
-  rm -rf "python-build-${CARCH}" | true
-  cp -r ${_realname}-${pkgver} python-build-${CARCH}
+  rm -rf "python-build-${MSYSTEM}" | true
+  cp -r ${_realname}-${pkgver} python-build-${MSYSTEM}
 }
 
 build() {
-  msg "Python build for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"  
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd ${srcdir}/python-build-${CARCH}
+  cd ${srcdir}/python-build-${MSYSTEM}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-oslotest/PKGBUILD b/mingw-w64-python-oslotest/PKGBUILD
index 6cb53e1c8a..3fb60a7ec4 100644
--- a/mingw-w64-python-oslotest/PKGBUILD
+++ b/mingw-w64-python-oslotest/PKGBUILD
@@ -46,8 +46,8 @@ del_file_exists() {
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
@@ -55,19 +55,19 @@ prepare() {
 }
 
 build() {
-  msg "Python build for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  msg "Python test for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python test for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   PYTHON=${MINGW_PREFIX}/bin/python ${MINGW_PREFIX}/bin/stestr run
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-pathspec/PKGBUILD b/mingw-w64-python-pathspec/PKGBUILD
index 97b6d223a4..60b529762d 100644
--- a/mingw-w64-python-pathspec/PKGBUILD
+++ b/mingw-w64-python-pathspec/PKGBUILD
@@ -19,23 +19,23 @@ source=("https://files.pythonhosted.org/packages/source/${_realname::1}/$_realna
 sha256sums=('a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712')
 
 prepare() {  
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  msg "Python build for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"  
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python -m unittest discover pathspec/tests || warning "Tests failed"
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}/"
+  cd "${srcdir}/python-build-${MSYSTEM}/"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-pdfrw/PKGBUILD b/mingw-w64-python-pdfrw/PKGBUILD
index ae82bf1f7f..8cfd03eaa5 100644
--- a/mingw-w64-python-pdfrw/PKGBUILD
+++ b/mingw-w64-python-pdfrw/PKGBUILD
@@ -23,23 +23,23 @@ sha256sums=('f4da059213a0fdf8f63aa3f711cfbc25a5100333514b396f71bb90cb7bd4365f')
 
 
 prepare() {
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 check() {
-  msg "Python test for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python test for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py check  
 }
 
 build() {
-  cd ${srcdir}/python-build-${CARCH}
+  cd ${srcdir}/python-build-${MSYSTEM}
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd ${srcdir}/python-build-${CARCH}
+  cd ${srcdir}/python-build-${MSYSTEM}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-pickleshare/PKGBUILD b/mingw-w64-python-pickleshare/PKGBUILD
index bc89e728ef..197942e795 100644
--- a/mingw-w64-python-pickleshare/PKGBUILD
+++ b/mingw-w64-python-pickleshare/PKGBUILD
@@ -24,23 +24,23 @@ sha256sums=('7a691d57650dbfb1f101c52d65743f87175cea98bd85cd2a0e92c0407faf3d1c')
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 
 }
 
 check() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/nosetests || true
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1 --skip-build
diff --git a/mingw-w64-python-pkgconfig/PKGBUILD b/mingw-w64-python-pkgconfig/PKGBUILD
index 1506e96740..771c3f2a9b 100644
--- a/mingw-w64-python-pkgconfig/PKGBUILD
+++ b/mingw-w64-python-pkgconfig/PKGBUILD
@@ -25,24 +25,24 @@ sha512sums=('ffa838d0146125c4158b747b619cc5eed41da0e2f04664a4db89909a486922120a0
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  msg "Python build for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"  
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  msg "Python test for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python test for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py test
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=2 --skip-build
diff --git a/mingw-w64-python-ply/PKGBUILD b/mingw-w64-python-ply/PKGBUILD
index 4eb910563a..46276ac8fe 100644
--- a/mingw-w64-python-ply/PKGBUILD
+++ b/mingw-w64-python-ply/PKGBUILD
@@ -25,18 +25,18 @@ sha256sums=('00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3'
 
 prepare() {  
   cd "${srcdir}"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  msg "Python build for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-poyo/PKGBUILD b/mingw-w64-python-poyo/PKGBUILD
index df613aad55..68b0df25ff 100644
--- a/mingw-w64-python-poyo/PKGBUILD
+++ b/mingw-w64-python-poyo/PKGBUILD
@@ -25,19 +25,19 @@ sha256sums=('e26956aa780c45f011ca9886f044590e2d8fd8b61db7b1c1cf4e0869f48ed4dd')
 
 prepare() {  
   cd "$srcdir"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_pyname//_/-}-$pkgver" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_pyname//_/-}-$pkgver" "python-build-${MSYSTEM}"
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  msg "Python build for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"  
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-pretend/PKGBUILD b/mingw-w64-python-pretend/PKGBUILD
index fff0247046..ec3a6729a5 100644
--- a/mingw-w64-python-pretend/PKGBUILD
+++ b/mingw-w64-python-pretend/PKGBUILD
@@ -20,18 +20,18 @@ sha256sums=('c90eb810cde8ebb06dafcb8796f9a95228ce796531bc806e794c2f4649aa1b10')
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {  
-  msg "Python build for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"  
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-progress/PKGBUILD b/mingw-w64-python-progress/PKGBUILD
index e87c472b8d..7c0d436fea 100644
--- a/mingw-w64-python-progress/PKGBUILD
+++ b/mingw-w64-python-progress/PKGBUILD
@@ -23,18 +23,18 @@ sha256sums=('e4a0d9e4370cd09f29ecdf72bf84c7177caef8374a90a627c83a84e619eb0f3d')
 
 prepare() {  
   cd "${srcdir}"
-  rm -rf python-build-${CARCH} | true
-  cp -rf "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -rf "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  msg "Python build for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-ptyprocess/PKGBUILD b/mingw-w64-python-ptyprocess/PKGBUILD
index ee43cf8b7a..e3a23f50b7 100644
--- a/mingw-w64-python-ptyprocess/PKGBUILD
+++ b/mingw-w64-python-ptyprocess/PKGBUILD
@@ -24,18 +24,18 @@ sha256sums=('5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220'
             'c822d385b1a73329846241799becf18690b5d44764c1bed69300b536a405030a')
 
 prepare() {
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  msg "Python build for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd ${srcdir}/"python-build-${CARCH}"
+  cd ${srcdir}/"python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1 --skip-build
 
diff --git a/mingw-w64-python-purl/PKGBUILD b/mingw-w64-python-purl/PKGBUILD
index ed56c8d785..98e0a6c3a3 100644
--- a/mingw-w64-python-purl/PKGBUILD
+++ b/mingw-w64-python-purl/PKGBUILD
@@ -22,23 +22,23 @@ sha256sums=('7feebbda6e40463096e49bc7ffeccfe644e5db307083d1e323609b8c1682fdd2')
 
 prepare() {  
   cd "$srcdir"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  msg "Python build for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"  
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py nosetests || warning "Tests failed"
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-py-cpuinfo/PKGBUILD b/mingw-w64-python-py-cpuinfo/PKGBUILD
index cb27ca996b..bb511c6285 100644
--- a/mingw-w64-python-py-cpuinfo/PKGBUILD
+++ b/mingw-w64-python-py-cpuinfo/PKGBUILD
@@ -23,25 +23,25 @@ source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/workhorsy/py-cpuinf
 sha256sums=('21dfd34d85f4d1419aad63f4945d7356025794fd1529c95644f618aac390625c')
 
 prepare() {
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python -m pytest
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-pycparser/PKGBUILD b/mingw-w64-python-pycparser/PKGBUILD
index a997c01629..059cb0e39b 100644
--- a/mingw-w64-python-pycparser/PKGBUILD
+++ b/mingw-w64-python-pycparser/PKGBUILD
@@ -23,25 +23,25 @@ sha256sums=('b074c239ee828fcb9c97774b942f3ce51f0d2edc00809f49c3c3ef0f3baaf9c1')
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-release_v${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-release_v${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  msg "Python build for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
   cd pycparser
   ${MINGW_PREFIX}/bin/python _build_tables.py
 }
 
 check() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python -m unittest discover
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-pyfastbti-git/PKGBUILD b/mingw-w64-python-pyfastbti-git/PKGBUILD
index 03c1d3bec7..7dfff534a9 100644
--- a/mingw-w64-python-pyfastbti-git/PKGBUILD
+++ b/mingw-w64-python-pyfastbti-git/PKGBUILD
@@ -27,19 +27,19 @@ pkgver() {
 
 prepare() {  
   cd "$srcdir"
-  rm -rf python-build-${CARCH} | true
-  cp -r "PyFastBTI" "python-build-${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "PyFastBTI" "python-build-${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
 }
 
 build() {
-  msg "Python build for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-pyfasttextureutils-git/PKGBUILD b/mingw-w64-python-pyfasttextureutils-git/PKGBUILD
index ffe72fcb6e..02088f7fdd 100644
--- a/mingw-w64-python-pyfasttextureutils-git/PKGBUILD
+++ b/mingw-w64-python-pyfasttextureutils-git/PKGBUILD
@@ -30,20 +30,20 @@ pkgver() {
 
 prepare() {  
   cd "$srcdir"
-  rm -rf python-build-${CARCH} | true
-  cp -r "PyFastTextureUtils" "python-build-${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "PyFastTextureUtils" "python-build-${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   patch -Np2 -i ../minmax.patch
 }
 
 build() {
-  msg "Python build for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-pyfilesystem2/PKGBUILD b/mingw-w64-python-pyfilesystem2/PKGBUILD
index 05c6be28dc..fb2609bb0d 100644
--- a/mingw-w64-python-pyfilesystem2/PKGBUILD
+++ b/mingw-w64-python-pyfilesystem2/PKGBUILD
@@ -29,26 +29,26 @@ source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/PyFilesystem/pyfile
 sha256sums=('c06b2570fe8cb425d0bda70c518becfc97b6e49bab289edae9359a4fb606d43e')
 
 prepare() {
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 # We would require "${MINGW_PACKAGE_PREFIX}-python-pyftpdlib"
 #check() {
-#  cd "${srcdir}/python-build-${CARCH}"
+#  cd "${srcdir}/python-build-${MSYSTEM}"
 #  ${MINGW_PREFIX}/bin/python setup.py test
 #}
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-python-pyserial/PKGBUILD b/mingw-w64-python-pyserial/PKGBUILD
index 2529e1f8c1..0c1754a7f0 100644
--- a/mingw-w64-python-pyserial/PKGBUILD
+++ b/mingw-w64-python-pyserial/PKGBUILD
@@ -22,22 +22,22 @@ source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/pyserial/pyserial/a
 sha512sums=('c2a700f5e08905bdab070c95cec41d6d423c20d2a9648c8c2f048db86de72f39fe2b8df560172d5b9d480be44c35ff0799df8f1d684d3f41f8fc61174105256e')
 
 prepare() {
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py check
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-python-pytest-expect/PKGBUILD b/mingw-w64-python-pytest-expect/PKGBUILD
index 15c16fb7a3..0a613295d7 100644
--- a/mingw-w64-python-pytest-expect/PKGBUILD
+++ b/mingw-w64-python-pytest-expect/PKGBUILD
@@ -25,25 +25,25 @@ sha256sums=('8392093123dfc9807c28fee251e1d710aaed0d46ee77c7531528fb0a265eb798')
 
 prepare() {
   cd ${srcdir}
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py check
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-pytest-flake8/PKGBUILD b/mingw-w64-python-pytest-flake8/PKGBUILD
index 49cc0289c4..51bfa8160e 100644
--- a/mingw-w64-python-pytest-flake8/PKGBUILD
+++ b/mingw-w64-python-pytest-flake8/PKGBUILD
@@ -21,25 +21,25 @@ sha256sums=('21bfa72f9a0faca2b60b3926f69086094ddad6363ebcaee4824743d97478a16a')
 
 prepare() {  
   cd "$srcdir"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
-  sed -i 's/ignore = E128/ignore = E128 W605/' "python-build-${CARCH}/tox.ini"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
+  sed -i 's/ignore = E128/ignore = E128 W605/' "python-build-${MSYSTEM}/tox.ini"
 }
 
 build() {
-  msg "Python build for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"  
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py install --root="$PWD/tmp_install" --optimize=1 || warning "Tests failed"
   PYTHONPATH="$PWD/${MINGW_PREFIX}/lib/python3.8/site-packages:$PYTHONPATH" ${MINGW_PREFIX}/bin/py.test || warning "Tests failed"
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-pyu2f/PKGBUILD b/mingw-w64-python-pyu2f/PKGBUILD
index f7a14790f2..25b938afb1 100644
--- a/mingw-w64-python-pyu2f/PKGBUILD
+++ b/mingw-w64-python-pyu2f/PKGBUILD
@@ -39,27 +39,27 @@ del_file_exists() {
 }
 
 prepare() {
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  msg "Python build for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  msg "Python test for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python test for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py check || true
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-re-assert/PKGBUILD b/mingw-w64-python-re-assert/PKGBUILD
index 07edbb260c..1533b2b988 100644
--- a/mingw-w64-python-re-assert/PKGBUILD
+++ b/mingw-w64-python-re-assert/PKGBUILD
@@ -20,24 +20,24 @@ source=("https://github.com/asottile/re-assert/archive/v$pkgver.tar.gz")
 sha256sums=('01c4a849ed520923e4bab9afdf73b5f2698c4f92ad7f580ccb3f68ea79c69c0c')
 
 prepare() {  
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
 }
 
 build() {
-  msg "Python build for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/pytest || warning "Tests failed"
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-rsa/PKGBUILD b/mingw-w64-python-rsa/PKGBUILD
index b851cd6a72..b7e8f9314c 100644
--- a/mingw-w64-python-rsa/PKGBUILD
+++ b/mingw-w64-python-rsa/PKGBUILD
@@ -21,18 +21,18 @@ sha256sums=('e38464a49c6c85d7f1351b0126661487a7e0a14a50f1675ec50eb34d4f20ef21')
 
 prepare() {
   cd "$srcdir"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  msg "Python build for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-scandir/PKGBUILD b/mingw-w64-python-scandir/PKGBUILD
index ce86998289..6d8b18194c 100644
--- a/mingw-w64-python-scandir/PKGBUILD
+++ b/mingw-w64-python-scandir/PKGBUILD
@@ -26,19 +26,19 @@ sha256sums=('73a773c58432ce28f32286f2892217101f4cf61ff4bccd8829ebaa7af7c56620')
 
 prepare() {
   cd ${srcdir}
-  rm -rf python-build-${CARCH} | true
-  cp -r ${_realname}-${pkgver} build-python-${CARCH}
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r ${_realname}-${pkgver} python-build-${MSYSTEM}
 }
 
 build() {
-  cd ${srcdir}/build-python-${CARCH}
+  cd ${srcdir}/python-build-${MSYSTEM}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   CPPFLAGS+=" -D_WIN32_WINNT=0x0600" \
     ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd ${srcdir}/build-python-${CARCH}
+  cd ${srcdir}/python-build-${MSYSTEM}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1 --skip-build
 
diff --git a/mingw-w64-python-screeninfo/PKGBUILD b/mingw-w64-python-screeninfo/PKGBUILD
index 22d7f7b2ec..9f9757af3b 100644
--- a/mingw-w64-python-screeninfo/PKGBUILD
+++ b/mingw-w64-python-screeninfo/PKGBUILD
@@ -25,19 +25,19 @@ sha256sums=('9983076bcc7e34402a1a9e4d7dabf3729411fd2abb3f3b4be7eba73519cd2ed1')
 
 prepare() {  
   cd "$srcdir"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_pyname//_/-}-$pkgver" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_pyname//_/-}-$pkgver" "python-build-${MSYSTEM}"
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  msg "Python build for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"  
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-scripttest/PKGBUILD b/mingw-w64-python-scripttest/PKGBUILD
index d13a87b676..2b4c91742c 100644
--- a/mingw-w64-python-scripttest/PKGBUILD
+++ b/mingw-w64-python-scripttest/PKGBUILD
@@ -20,20 +20,20 @@ sha512sums=('a54aab83e102a8aa9fdbbcbaff5e8b758886c2db2d1eefee9448895b5ebd8d10115
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  msg "Python build for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-setuptools-git/PKGBUILD b/mingw-w64-python-setuptools-git/PKGBUILD
index 1ca0cf03d1..b184e02413 100644
--- a/mingw-w64-python-setuptools-git/PKGBUILD
+++ b/mingw-w64-python-setuptools-git/PKGBUILD
@@ -28,22 +28,22 @@ prepare() {
   cd "${_pyname//_/-}-$pkgver"
   patch -p1 -i ${srcdir}/0001-use-git-show-prefix.patch
   cd "${srcdir}"
-  rm -rf python-build-${CARCH}
-  cp -r "${_pyname//_/-}-$pkgver" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM}
+  cp -r "${_pyname//_/-}-$pkgver" "python-build-${MSYSTEM}"
 }
 
 check(){
-  cd "${srcdir}/python-build-${CARCH}/${pyname}"
+  cd "${srcdir}/python-build-${MSYSTEM}/${pyname}"
   ${MINGW_PREFIX}/bin/python -m unittest || true
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1 --skip-build
 }
diff --git a/mingw-w64-python-simplegeneric/PKGBUILD b/mingw-w64-python-simplegeneric/PKGBUILD
index b94bbaa048..2bac04e5b0 100644
--- a/mingw-w64-python-simplegeneric/PKGBUILD
+++ b/mingw-w64-python-simplegeneric/PKGBUILD
@@ -23,25 +23,25 @@ sha256sums=('dc972e06094b9af5b855b3df4a646395e43d1c9d0d39ed345b7393560d0b9173')
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py test
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
     ${MINGW_PREFIX}/bin/python setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1 --skip-build
diff --git a/mingw-w64-python-smartypants/PKGBUILD b/mingw-w64-python-smartypants/PKGBUILD
index 9fc58a947a..ce964b1e55 100644
--- a/mingw-w64-python-smartypants/PKGBUILD
+++ b/mingw-w64-python-smartypants/PKGBUILD
@@ -46,27 +46,27 @@ prepare() {
     apply_patch_with_msg fix-tests.patch
   popd
 
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}.py-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}.py-${pkgver}" "python-build-${MSYSTEM}"
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  msg "Python build for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"  
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  msg "Python test for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python test for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py test
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-snowballstemmer/PKGBUILD b/mingw-w64-python-snowballstemmer/PKGBUILD
index 4009990995..941e2ead3a 100644
--- a/mingw-w64-python-snowballstemmer/PKGBUILD
+++ b/mingw-w64-python-snowballstemmer/PKGBUILD
@@ -20,21 +20,21 @@ sha256sums=('09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1')
 
 prepare() {
   cd ${srcdir}
-  cp -r ${_realname}-${pkgver} python-build-${CARCH}
+  cp -r ${_realname}-${pkgver} python-build-${MSYSTEM}
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python py.test
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
     ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1 --skip-build
 
diff --git a/mingw-w64-python-sphinxcontrib-jsmath/PKGBUILD b/mingw-w64-python-sphinxcontrib-jsmath/PKGBUILD
index d5e4f1ef7b..8e29581010 100644
--- a/mingw-w64-python-sphinxcontrib-jsmath/PKGBUILD
+++ b/mingw-w64-python-sphinxcontrib-jsmath/PKGBUILD
@@ -23,21 +23,21 @@ sha256sums=('a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8')
 
 prepare() {
   cd ${srcdir}
-  cp -r ${_realname}-${pkgver} python-build-${CARCH}
+  cp -r ${_realname}-${pkgver} python-build-${MSYSTEM}
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/py.test || warning "test failed"
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install -O1 --skip-build \
       --root="${pkgdir}" --prefix=${MINGW_PREFIX}
diff --git a/mingw-w64-python-srt/PKGBUILD b/mingw-w64-python-srt/PKGBUILD
index 5fc4863f07..de170d5e3a 100644
--- a/mingw-w64-python-srt/PKGBUILD
+++ b/mingw-w64-python-srt/PKGBUILD
@@ -24,19 +24,19 @@ source=("${_pyname}-${pkgver}.tar.gz::https://pypi.org/packages/source/${_pyname
 sha256sums=('4884315043a4f0740fd1f878ed6caa376ac06d70e135f306a6dc44632eed0cc0')
 
 prepare() {  
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_pyname//_/-}-$pkgver" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_pyname//_/-}-$pkgver" "python-build-${MSYSTEM}"
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  msg "Python build for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"  
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-testscenarios/PKGBUILD b/mingw-w64-python-testscenarios/PKGBUILD
index a5cde83fd1..a9607ec4f8 100644
--- a/mingw-w64-python-testscenarios/PKGBUILD
+++ b/mingw-w64-python-testscenarios/PKGBUILD
@@ -44,8 +44,8 @@ del_file_exists() {
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
@@ -54,19 +54,19 @@ prepare() {
 }
 
 build() {
-  msg "Python build for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  msg "Python test for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python test for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python -m testtools.run testscenarios.test_suite
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-text-unidecode/PKGBUILD b/mingw-w64-python-text-unidecode/PKGBUILD
index 501e21f149..65f2956fa4 100644
--- a/mingw-w64-python-text-unidecode/PKGBUILD
+++ b/mingw-w64-python-text-unidecode/PKGBUILD
@@ -46,27 +46,27 @@ prepare() {
 #  apply_patch_with_msg 0001-A-really-important-fix.patch \
 #    0002-A-less-important-fix.patch
 
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  msg "Python build for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"  
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  msg "Python test for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python test for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py pytest
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-toml/PKGBUILD b/mingw-w64-python-toml/PKGBUILD
index 2e887d513b..23a10acc9d 100644
--- a/mingw-w64-python-toml/PKGBUILD
+++ b/mingw-w64-python-toml/PKGBUILD
@@ -47,28 +47,28 @@ prepare() {
   cd "${srcdir}"
 
   cp -v test.toml "${_realname}-$pkgver"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  msg "Python build for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
   # disable useless tests
-  msg "Python test for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python test for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/py.test tests -k 'not test_invalid_tests and not test_valid_tests'
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-typogrify/PKGBUILD b/mingw-w64-python-typogrify/PKGBUILD
index 1060bd9288..b946820db0 100644
--- a/mingw-w64-python-typogrify/PKGBUILD
+++ b/mingw-w64-python-typogrify/PKGBUILD
@@ -26,19 +26,19 @@ sha256sums=('8be4668cda434163ce229d87ca273a11922cb1614cb359970b7dc96eed13cb38')
 
 prepare() {  
   cd "$srcdir"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_pyname//_/-}-$pkgver" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_pyname//_/-}-$pkgver" "python-build-${MSYSTEM}"
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  msg "Python build for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"  
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-ukpostcodeparser/PKGBUILD b/mingw-w64-python-ukpostcodeparser/PKGBUILD
index 3df70710b2..a61c568a90 100644
--- a/mingw-w64-python-ukpostcodeparser/PKGBUILD
+++ b/mingw-w64-python-ukpostcodeparser/PKGBUILD
@@ -20,27 +20,27 @@ sha512sums=('8113522b728c095f937a9f53f21c369130e3e63c4fc3546dbea4ad1c53648742fb0
 
 prepare() {
   cd "${srcdir}"
-  rm -rf "python-build-${CARCH}" | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf "python-build-${MSYSTEM}" | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  msg "Python build for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  msg "Python test for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python test for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python -m unittest discover -s ukpostcodeparser/test -p '*.py' || warning "Tests failed"
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-webencodings/PKGBUILD b/mingw-w64-python-webencodings/PKGBUILD
index 2b97d1f4e4..4f80ba97ce 100644
--- a/mingw-w64-python-webencodings/PKGBUILD
+++ b/mingw-w64-python-webencodings/PKGBUILD
@@ -23,23 +23,23 @@ sha256sums=('082367f568a7812aa5f6922ffe3d9d027cd83829dc32bcaac4c874eeed618000')
 
 prepare() {  
   cd "${srcdir}"
-  rm -rf python-build-${CARCH} | true
-  cp -r "python-${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "python-${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  msg "Python build for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"  
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python-build-${CARCH}/build/lib/webencodings/"
+  cd "${srcdir}/python-build-${MSYSTEM}/build/lib/webencodings/"
   ${MINGW_PREFIX}/bin/nosetests
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root=${pkgdir} --skip-build
 }
diff --git a/mingw-w64-python-whoosh/PKGBUILD b/mingw-w64-python-whoosh/PKGBUILD
index bcd152e35c..85b7049aac 100644
--- a/mingw-w64-python-whoosh/PKGBUILD
+++ b/mingw-w64-python-whoosh/PKGBUILD
@@ -25,21 +25,21 @@ sha256sums=('SKIP')
 
 prepare() {
   cd ${srcdir}
-  cp -r ${_realname} build-python-${CARCH}
+  cp -r ${_realname} python-build-${MSYSTEM}
 }
 
 build() {
-  cd "${srcdir}/build-python-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/build-python-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py ptr || echo "Tests failed"
 }
 
 package() {
-  cd "${srcdir}/build-python-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" --skip-build
diff --git a/mingw-w64-python-win_inet_pton/PKGBUILD b/mingw-w64-python-win_inet_pton/PKGBUILD
index b0e9ca3d3f..959685def7 100644
--- a/mingw-w64-python-win_inet_pton/PKGBUILD
+++ b/mingw-w64-python-win_inet_pton/PKGBUILD
@@ -23,18 +23,18 @@ sha256sums=('dd03d942c0d3e2b1cf8bab511844546dfa5f74cb61b241699fa379ad707dea4f')
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  msg "Python build for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"  
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-win_unicode_console/PKGBUILD b/mingw-w64-python-win_unicode_console/PKGBUILD
index 1a6a41c9f4..3325c6318f 100644
--- a/mingw-w64-python-win_unicode_console/PKGBUILD
+++ b/mingw-w64-python-win_unicode_console/PKGBUILD
@@ -23,17 +23,17 @@ sha256sums=('2eca3277096ddf88f852b667fcdd866a342500f86c6e10cce9842420290d5048')
 
 prepare() {
   cd "${srcdir}"
-  rm -rf python-build-${CARCH} | true
-  cp -r "win-unicode-console-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "win-unicode-console-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1 --skip-build
 
diff --git a/mingw-w64-python-xdg/PKGBUILD b/mingw-w64-python-xdg/PKGBUILD
index 035d1027de..17965c8fdf 100644
--- a/mingw-w64-python-xdg/PKGBUILD
+++ b/mingw-w64-python-xdg/PKGBUILD
@@ -27,26 +27,26 @@ source=("${_pyname}-${pkgver}.tar.gz"::"https://github.com/takluyver/pyxdg/archi
 sha256sums=('29152f20f46a5e2365ae74fc00341ba761688de879100ebccaff507971a78c36')
 
 prepare() {
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_pyname}-rel-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_pyname}-rel-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {  
-  msg "Python build for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
       ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  msg "Python test for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python test for ${MSYSTEM}"  
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
       ${MINGW_PREFIX}/bin/python setup.py check
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-qhull/PKGBUILD b/mingw-w64-qhull/PKGBUILD
index b3dad82e4a..214416ac17 100644
--- a/mingw-w64-qhull/PKGBUILD
+++ b/mingw-w64-qhull/PKGBUILD
@@ -30,8 +30,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
@@ -50,12 +50,12 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/ctest.exe ./ || true
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
 
   install -Dm644 libqhull.dll "${pkgdir}${MINGW_PREFIX}/bin/libqhull.dll"
diff --git a/mingw-w64-ragel/PKGBUILD b/mingw-w64-ragel/PKGBUILD
index 81c8f923bf..28e3f82817 100644
--- a/mingw-w64-ragel/PKGBUILD
+++ b/mingw-w64-ragel/PKGBUILD
@@ -16,9 +16,9 @@ source=("https://www.colm.net/files/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('5f156edb65d20b856d638dd9ee2dfb43285914d9aa2b6ec779dac0270cd56c3f')
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
-  mkdir -p "build-${MINGW_CHOST}"
-  cd "build-${MINGW_CHOST}"
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
+  mkdir -p "build-${MSYSTEM}"
+  cd "build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -29,7 +29,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   make DESTDIR="${pkgdir}" install
   install -m0644 -D ${srcdir}/${_realname}-${pkgver}/ragel.vim "${pkgdir}${MINGW_PREFIX}"/share/vim/vimfiles/syntax/ragel.vim
diff --git a/mingw-w64-rapidjson/PKGBUILD b/mingw-w64-rapidjson/PKGBUILD
index 1e6b9a9fe7..7a086cb9d9 100644
--- a/mingw-w64-rapidjson/PKGBUILD
+++ b/mingw-w64-rapidjson/PKGBUILD
@@ -60,7 +60,7 @@ prepare() {
   apply_patch_with_msg \
     0005-PrettyWriter.patch
 
-  if [[ ${MSYSTEM_CARCH} == aarch64 ]]; then
+  if [[ ${CARCH} == aarch64 ]]; then
     apply_patch_with_msg 0006-aarch64.patch
   fi
 
@@ -77,8 +77,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${CARCH}" ]] && rm -rf "build-${CARCH}"
-  mkdir "${srcdir}/build-${CARCH}" && cd "${srcdir}/build-${CARCH}"
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
+  mkdir "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL='-DCMAKE_INSTALL_PREFIX=' \
   ${MINGW_PREFIX}/bin/cmake.exe \
@@ -90,7 +90,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/license.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/license.txt"
diff --git a/mingw-w64-readosm/PKGBUILD b/mingw-w64-readosm/PKGBUILD
index b8ad151c63..1f37bfa6e6 100644
--- a/mingw-w64-readosm/PKGBUILD
+++ b/mingw-w64-readosm/PKGBUILD
@@ -24,9 +24,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${_pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -38,6 +38,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR=${pkgdir} install
 }
diff --git a/mingw-w64-rrdtool/PKGBUILD b/mingw-w64-rrdtool/PKGBUILD
index 563828df15..c4d5f0dc36 100644
--- a/mingw-w64-rrdtool/PKGBUILD
+++ b/mingw-w64-rrdtool/PKGBUILD
@@ -22,13 +22,13 @@ source=("https://github.com/oetiker/rrdtool-1.x/releases/download/v${pkgver}/${_
 sha256sums=('5e65385e51f4a7c4b42aa09566396c20e7e1a0a30c272d569ed029a81656e56b')
 
 prepare() {
-  cp -Rf "${srcdir}/${_realname}-${pkgver}" "${srcdir}"/build-${CARCH}
-  cd "${srcdir}"/build-${CARCH}
+  cp -Rf "${srcdir}/${_realname}-${pkgver}" "${srcdir}"/build-${MSYSTEM}
+  cd "${srcdir}"/build-${MSYSTEM}
   ./bootstrap
 }
 
 build() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
 
   # Do not add --host and --target options, otherwise
   # executables are installed with target triplet prefixes
@@ -50,7 +50,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make install DESTDIR="${pkgdir}"
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYRIGHT" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYRIGHT"
diff --git a/mingw-w64-rtmpdump/PKGBUILD b/mingw-w64-rtmpdump/PKGBUILD
index d766113bea..5b21c8f2c1 100644
--- a/mingw-w64-rtmpdump/PKGBUILD
+++ b/mingw-w64-rtmpdump/PKGBUILD
@@ -72,13 +72,13 @@ prepare() {
 }
 
 build() {
-  cp -rf "${srcdir}/$_realname" "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cp -rf "${srcdir}/$_realname" "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make CC=${CC} LD=ld AR=ar SYS=mingw
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   mkdir -p ${pkgdir}${MINGW_PREFIX}/lib
   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-sassc/PKGBUILD b/mingw-w64-sassc/PKGBUILD
index f02fcdb8e3..9abc601c5e 100644
--- a/mingw-w64-sassc/PKGBUILD
+++ b/mingw-w64-sassc/PKGBUILD
@@ -25,8 +25,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -38,7 +38,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   make DESTDIR="${pkgdir}" install
 
diff --git a/mingw-w64-schroedinger/PKGBUILD b/mingw-w64-schroedinger/PKGBUILD
index d6dd6e39fe..fa82d166c6 100644
--- a/mingw-w64-schroedinger/PKGBUILD
+++ b/mingw-w64-schroedinger/PKGBUILD
@@ -33,9 +33,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
+  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-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-scour/PKGBUILD b/mingw-w64-scour/PKGBUILD
index 13297b5ebc..eb223677c5 100644
--- a/mingw-w64-scour/PKGBUILD
+++ b/mingw-w64-scour/PKGBUILD
@@ -21,21 +21,21 @@ sha256sums=('26166de53d9da3eccc52570bf8c2853e60efefd9e90e26fdfc7124fe0bd873af')
 
 prepare() {
   cd "${srcdir}"
-  cp -r ${_realname}-${pkgver} python-build-${CARCH}
+  cp -r ${_realname}-${pkgver} python-build-${MSYSTEM}
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py check
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
         --root "${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-scummvm/PKGBUILD b/mingw-w64-scummvm/PKGBUILD
index 97058c10c6..0f7561d7a8 100644
--- a/mingw-w64-scummvm/PKGBUILD
+++ b/mingw-w64-scummvm/PKGBUILD
@@ -28,7 +28,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-libmpeg2-git"
          "${MINGW_PACKAGE_PREFIX}-libtheora"
          "${MINGW_PACKAGE_PREFIX}-libpng"
-         $([[ ${MSYSTEM_CARCH} == aarch64 ]] || echo "${MINGW_PACKAGE_PREFIX}-nasm")
+         $([[ ${CARCH} == aarch64 ]] || echo "${MINGW_PACKAGE_PREFIX}-nasm")
          "${MINGW_PACKAGE_PREFIX}-readline"
          "${MINGW_PACKAGE_PREFIX}-SDL2"
          "${MINGW_PACKAGE_PREFIX}-SDL2_net"
diff --git a/mingw-w64-seexpr/PKGBUILD b/mingw-w64-seexpr/PKGBUILD
index 318080d6b0..2aa8168c3e 100644
--- a/mingw-w64-seexpr/PKGBUILD
+++ b/mingw-w64-seexpr/PKGBUILD
@@ -40,9 +40,9 @@ prepare() {
 
 build() {
   # Shared Build
-  [[ -d "build-${MINGW_CHOST}-shared" ]] && rm -rf "build-${MINGW_CHOST}-shared"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}-shared"
-  cd "${srcdir}/build-${MINGW_CHOST}-shared"
+  [[ -d "build-${MSYSTEM}-shared" ]] && rm -rf "build-${MSYSTEM}-shared"
+  mkdir -p "${srcdir}/build-${MSYSTEM}-shared"
+  cd "${srcdir}/build-${MSYSTEM}-shared"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
@@ -58,9 +58,9 @@ build() {
   make
   
   # Static Build
-  [[ -d "build-${MINGW_CHOST}-static" ]] && rm -rf "build-${MINGW_CHOST}-static"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}-static"
-  cd "${srcdir}/build-${MINGW_CHOST}-static"
+  [[ -d "build-${MSYSTEM}-static" ]] && rm -rf "build-${MSYSTEM}-static"
+  mkdir -p "${srcdir}/build-${MSYSTEM}-static"
+  cd "${srcdir}/build-${MSYSTEM}-static"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
@@ -78,10 +78,10 @@ build() {
 
 package() {
   # Shared Install
-  cd "${srcdir}/build-${MINGW_CHOST}-shared"
+  cd "${srcdir}/build-${MSYSTEM}-shared"
   make DESTDIR=${pkgdir} install
 
   # Static Install
-  cd "${srcdir}/build-${MINGW_CHOST}-static"
+  cd "${srcdir}/build-${MSYSTEM}-static"
   make DESTDIR=${pkgdir} install
 }
diff --git a/mingw-w64-sgml-common/PKGBUILD b/mingw-w64-sgml-common/PKGBUILD
index 98d339c692..d9be583c9e 100644
--- a/mingw-w64-sgml-common/PKGBUILD
+++ b/mingw-w64-sgml-common/PKGBUILD
@@ -40,10 +40,10 @@ prepare() {
 
 build() {
   cd "$srcdir"/${_realname}-${pkgver}
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} \
-   && cp -Rf * "${srcdir}"/build-${CARCH} \
-   && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} \
+   && cp -Rf * "${srcdir}"/build-${MSYSTEM} \
+   && cd "${srcdir}"/build-${MSYSTEM}
    ./configure --prefix=${MINGW_PREFIX} \
     --sysconfdir=${MINGW_PREFIX}/etc \
     --build=${MINGW_CHOST} \
@@ -52,7 +52,7 @@ build() {
   make
 }
 package(){
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make DESTDIR="$pkgdir" docdir=${MINGW_PREFIX}/share/doc install
 # patch sgmlwhich so it will work with our setup
   sed -i -e "s|\/etc\/|${MINGW_PREFIX}\/etc\/|g" $pkgdir${MINGW_PREFIX}/bin/sgmlwhich
diff --git a/mingw-w64-shine/PKGBUILD b/mingw-w64-shine/PKGBUILD
index 1876636ae6..ca72b1059c 100644
--- a/mingw-w64-shine/PKGBUILD
+++ b/mingw-w64-shine/PKGBUILD
@@ -28,9 +28,9 @@ prepare() {
 
 build() {
   cd "$srcdir"/${_realname}-${pkgver}
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
-  cp -R ${srcdir}/${_realname}-${pkgver}/* ${srcdir}/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
+  cp -R ${srcdir}/${_realname}-${pkgver}/* ${srcdir}/build-${MSYSTEM}
   ./configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -43,6 +43,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make install DESTDIR="${pkgdir}"
 }
diff --git a/mingw-w64-shishi/PKGBUILD b/mingw-w64-shishi/PKGBUILD
index 359dec0987..b84dbcd898 100644
--- a/mingw-w64-shishi/PKGBUILD
+++ b/mingw-w64-shishi/PKGBUILD
@@ -38,9 +38,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd build-${MINGW_CHOST}
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  cd build-${MSYSTEM}
 
   ../"${_realname}-${pkgver}"/configure \
     --prefix=${MINGW_PREFIX} \
@@ -54,6 +54,6 @@ build() {
 }
 
 package() {
-  cd build-${MINGW_CHOST}
+  cd build-${MSYSTEM}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-silc-toolkit/PKGBUILD b/mingw-w64-silc-toolkit/PKGBUILD
index c3b569f13c..afdc6342ec 100644
--- a/mingw-w64-silc-toolkit/PKGBUILD
+++ b/mingw-w64-silc-toolkit/PKGBUILD
@@ -46,9 +46,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MINGW_CHOST} ]] && rm -rf "${srcdir}"/build-${MINGW_CHOST}
-  cp -rf ${_realname}-${pkgver} build-${MINGW_CHOST}
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  cp -rf ${_realname}-${pkgver} build-${MSYSTEM}
+  cd "${srcdir}/build-${MSYSTEM}"
   ./configure \
       --prefix=${MINGW_PREFIX} \
       --with-simdir=${MINGW_PREFIX}/lib/silc/modules \
@@ -58,7 +58,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 
   # Licenses
diff --git a/mingw-w64-skyr-url/PKGBUILD b/mingw-w64-skyr-url/PKGBUILD
index 646ecd82e5..0385324fd5 100644
--- a/mingw-w64-skyr-url/PKGBUILD
+++ b/mingw-w64-skyr-url/PKGBUILD
@@ -27,8 +27,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   declare -a _extra_config
   if check_option "debug" "n"; then
@@ -54,7 +54,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
 
   install -Dm644 "${srcdir}/url-${pkgver}/LICENSE_1_0.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE_1_0.txt"
diff --git a/mingw-w64-smpeg2/PKGBUILD b/mingw-w64-smpeg2/PKGBUILD
index 826c93da78..d3cf15153a 100644
--- a/mingw-w64-smpeg2/PKGBUILD
+++ b/mingw-w64-smpeg2/PKGBUILD
@@ -24,9 +24,9 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}/"
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}/"
 
   CFLAGS+=" -Wno-error=narrowing"
   lt_cv_deplibs_check_method=pass_all \
@@ -42,7 +42,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 
   # hacky way of resolving conflicts
diff --git a/mingw-w64-soil/PKGBUILD b/mingw-w64-soil/PKGBUILD
index 36b8936dcb..ba19051e99 100644
--- a/mingw-w64-soil/PKGBUILD
+++ b/mingw-w64-soil/PKGBUILD
@@ -16,18 +16,18 @@ source=("${_realname}-${pkgver}.zip::https://web.archive.org/web/20160319195722i
 sha256sums=('a2305b8d64f6d636e36d669bbdb0ca5445d1345c754b3d61d3f037dad2e5f701')
 
 build() {
-  mkdir -p ${srcdir}/build-${MINGW_CHOST}/obj
-  mkdir -p ${srcdir}/build-${MINGW_CHOST}/lib
+  mkdir -p ${srcdir}/build-${MSYSTEM}/obj
+  mkdir -p ${srcdir}/build-${MSYSTEM}/lib
   cd "${srcdir}/Simple OpenGL Image Library/projects/makefile"
-  make OBJDIR=${srcdir}/build-${MINGW_CHOST}/obj LIBDIR=${srcdir}/build-${MINGW_CHOST}/lib
+  make OBJDIR=${srcdir}/build-${MSYSTEM}/obj LIBDIR=${srcdir}/build-${MSYSTEM}/lib
 }
 
 package() {
   cd "${srcdir}/Simple OpenGL Image Library/projects/makefile"
   mkdir -p ${pkgdir}${MINGW_PREFIX}/lib
   mkdir -p ${pkgdir}${MINGW_PREFIX}/include/SOIL
-  make LOCAL=${pkgdir}${MINGW_PREFIX} OBJDIR=${srcdir}/build-${MINGW_CHOST}/obj \
-   LIBDIR=${srcdir}/build-${MINGW_CHOST}/lib install
+  make LOCAL=${pkgdir}${MINGW_PREFIX} OBJDIR=${srcdir}/build-${MSYSTEM}/obj \
+   LIBDIR=${srcdir}/build-${MSYSTEM}/lib install
   mv ${pkgdir}${MINGW_PREFIX}/include/SOIL.h ${pkgdir}${MINGW_PREFIX}/include/SOIL/
   
   mkdir -p ${pkgdir}${MINGW_PREFIX}/share/doc/SOIL
diff --git a/mingw-w64-solid3/PKGBUILD b/mingw-w64-solid3/PKGBUILD
index fb1510b375..f312164983 100644
--- a/mingw-w64-solid3/PKGBUILD
+++ b/mingw-w64-solid3/PKGBUILD
@@ -33,8 +33,8 @@ prepare() {
 
 build() {
   cd "${srcdir}"/${_realname}-${_commit}
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   declare -a extra_config
   if check_option "debug" "n"; then
@@ -56,7 +56,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
 
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build . --target install
 
diff --git a/mingw-w64-spandsp/PKGBUILD b/mingw-w64-spandsp/PKGBUILD
index cfefdc592e..1f799caeae 100644
--- a/mingw-w64-spandsp/PKGBUILD
+++ b/mingw-w64-spandsp/PKGBUILD
@@ -33,8 +33,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   CPPFLAGS+=" -DLIBSPANDSP_EXPORTS" \
   ../${_realname}-${pkgver}/configure \
@@ -47,12 +47,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
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
diff --git a/mingw-w64-sparsehash/PKGBUILD b/mingw-w64-sparsehash/PKGBUILD
index a8c71a3075..93cb36d4ef 100644
--- a/mingw-w64-sparsehash/PKGBUILD
+++ b/mingw-w64-sparsehash/PKGBUILD
@@ -16,8 +16,8 @@ source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/sparsehash/sparseha
 sha256sums=('8cd1a95827dfd8270927894eb77f62b4087735cbede953884647f16c521c7e58')
 
 build() {
-  [[ -d "${srcdir}"/build-${MINGW_CHOST} ]] && rm -rf "${srcdir}"/build-${MINGW_CHOST}
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${_realname}-${pkgver}/configure \
     --host=${MINGW_CHOST} \
@@ -29,12 +29,12 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make -k check
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
   install -D -m644 "${srcdir}/${_realname}-${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
 }
diff --git a/mingw-w64-speex/PKGBUILD b/mingw-w64-speex/PKGBUILD
index d4ae8c4c0f..e76a4ca9ab 100644
--- a/mingw-w64-speex/PKGBUILD
+++ b/mingw-w64-speex/PKGBUILD
@@ -27,8 +27,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
-  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
+  mkdir -p ${srcdir}/build-${MSYSTEM} && 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
   install -Dm644 ${srcdir}/${_realname}-${pkgver}/COPYING "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 }
diff --git a/mingw-w64-speexdsp/PKGBUILD b/mingw-w64-speexdsp/PKGBUILD
index 5d821f6d6b..9277461b52 100644
--- a/mingw-w64-speexdsp/PKGBUILD
+++ b/mingw-w64-speexdsp/PKGBUILD
@@ -28,8 +28,8 @@ prepare() {
 
 build() {
   #export lt_cv_deplibs_check_method='pass_all'
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
-  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -41,7 +41,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"
 }
diff --git a/mingw-w64-spice-protocol/PKGBUILD b/mingw-w64-spice-protocol/PKGBUILD
index fd343c5555..640b31bc6f 100644
--- a/mingw-w64-spice-protocol/PKGBUILD
+++ b/mingw-w64-spice-protocol/PKGBUILD
@@ -23,9 +23,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MINGW_CHOST} ]] && rm -rf "${srcdir}"/build-${MINGW_CHOST}
-  mkdir -p build-${MINGW_CHOST}
-  cd build-${MINGW_CHOST}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM}
+  cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   meson \
@@ -37,7 +37,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
diff --git a/mingw-w64-stxxl-git/PKGBUILD b/mingw-w64-stxxl-git/PKGBUILD
index 8fb8e544d8..b1ad502b01 100644
--- a/mingw-w64-stxxl-git/PKGBUILD
+++ b/mingw-w64-stxxl-git/PKGBUILD
@@ -38,8 +38,8 @@ prepare() {
 }
 
 build() {
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   CXXFLAGS+=" -Wno-deprecated-copy" \
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
@@ -57,7 +57,7 @@ build() {
 
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install .
 
diff --git a/mingw-w64-t1utils/PKGBUILD b/mingw-w64-t1utils/PKGBUILD
index 1b2d407693..f15d1ba405 100644
--- a/mingw-w64-t1utils/PKGBUILD
+++ b/mingw-w64-t1utils/PKGBUILD
@@ -40,8 +40,8 @@ prepare() {
 
 build() {
   cd "${srcdir}"/${_realname}-${pkgver}
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -52,12 +52,12 @@ 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}"
 
   install -D -m644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
diff --git a/mingw-w64-tclvfs/PKGBUILD b/mingw-w64-tclvfs/PKGBUILD
index e7fdccfc9e..11147af418 100644
--- a/mingw-w64-tclvfs/PKGBUILD
+++ b/mingw-w64-tclvfs/PKGBUILD
@@ -24,7 +24,7 @@ sha256sums=('508dc305536f29023a6142056b6729617c2e3d93f5b86054128a7b7688ec9344')
 _cvsroot=":pserver:anonymous:@tclvfs.cvs.sourceforge.net:/cvsroot/tclvfs"
 _cvsmod="${_realname}"
 
-_build="${srcdir}/$_cvsmod-build${CARCH}"
+_build="${srcdir}/$_cvsmod-build${MSYSTEM}"
 
 prepare() {
   cd "${srcdir}"
diff --git a/mingw-w64-tidy/PKGBUILD b/mingw-w64-tidy/PKGBUILD
index 99d91df829..a99ac57cc9 100644
--- a/mingw-w64-tidy/PKGBUILD
+++ b/mingw-w64-tidy/PKGBUILD
@@ -30,8 +30,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "$srcdir}/build-${CARCH}" ]] && rm -rf "$srcdir/build-${CARCH}"
-  mkdir -p "$srcdir/build-${CARCH}" && cd "$srcdir/build-${CARCH}"
+  [[ -d "$srcdir}/build-${MSYSTEM}" ]] && rm -rf "$srcdir/build-${MSYSTEM}"
+  mkdir -p "$srcdir/build-${MSYSTEM}" && cd "$srcdir/build-${MSYSTEM}"
 
   declare -a extra_config
   if check_option "debug" "n"; then
@@ -53,7 +53,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build-${CARCH}
+  cd ${srcdir}/build-${MSYSTEM}
   DESTDIR="$pkgdir" ${MINGW_PREFIX}/bin/cmake.exe --install ./
 
 # Compatibility symlinks until everything is ported
diff --git a/mingw-w64-tiny-dnn/PKGBUILD b/mingw-w64-tiny-dnn/PKGBUILD
index 92de9bd5d8..572cb5724e 100644
--- a/mingw-w64-tiny-dnn/PKGBUILD
+++ b/mingw-w64-tiny-dnn/PKGBUILD
@@ -39,8 +39,8 @@ build() {
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     -DCMAKE_BUILD_TYPE=Release \
     -DUSE_TBB=OFF \
-    $([[ ${MSYSTEM_CARCH} == aarch64 ]] && echo "-DUSE_SSE=OFF") \
-    $([[ ${MSYSTEM_CARCH} == aarch64 ]] && echo "-DUSE_AVX=OFF") \
+    $([[ ${CARCH} == aarch64 ]] && echo "-DUSE_SSE=OFF") \
+    $([[ ${CARCH} == aarch64 ]] && echo "-DUSE_AVX=OFF") \
     -DBUILD_TESTS=ON \
     -DINSTALL_GTEST=OFF \
     ../${_realname}-${pkgver}
@@ -50,7 +50,7 @@ build() {
 
 check() {
   cd ${srcdir}/${_realname}-${pkgver}/test
-  ${srcdir}/build-${MINGW_CHOST}/test/tiny_dnn_test.exe || true
+  ${srcdir}/build-${MSYSTEM}/test/tiny_dnn_test.exe || true
 }
 
 package() {
diff --git a/mingw-w64-tinyxml/PKGBUILD b/mingw-w64-tinyxml/PKGBUILD
index 90686f3e21..a7797ee83c 100644
--- a/mingw-w64-tinyxml/PKGBUILD
+++ b/mingw-w64-tinyxml/PKGBUILD
@@ -31,9 +31,9 @@ prepare() {
 }
 
 build() {
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cp -r "${srcdir}/tinyxml/"* "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  cp -r "${srcdir}/tinyxml/"* "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
   for file in $(ls *.cpp | grep -v xmltest); do
     ${CXX} -c -Wall -Wno-unknown-pragmas -Wno-format -O3 ${file}
   done
@@ -42,7 +42,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   install -Dm644 libtinyxml.a "${pkgdir}${MINGW_PREFIX}/lib/libtinyxml.a"
   install -Dm644 libtinyxml-0.dll "${pkgdir}${MINGW_PREFIX}/bin/libtinyxml-0.dll"
   install -m644 libtinyxml.dll.a "${pkgdir}${MINGW_PREFIX}/lib/"
diff --git a/mingw-w64-tkimg/PKGBUILD b/mingw-w64-tkimg/PKGBUILD
index 8c26bb14ec..148e81e9d2 100644
--- a/mingw-w64-tkimg/PKGBUILD
+++ b/mingw-w64-tkimg/PKGBUILD
@@ -45,8 +45,8 @@ build() {
     extra_config+=( --enable-symbols )
   fi
 
-  mkdir -p "${srcdir}/build-${CARCH}"
-  cd "${srcdir}/build-${CARCH}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   ../Img-${pkgver}/configure \
     --build=${MINGW_CHOST} \
@@ -60,7 +60,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make INSTALL_ROOT="${pkgdir}" install
   rm -f ${pkgdir}/${MINGW_PREFIX}/lib/*.sh
 }
diff --git a/mingw-w64-tktable/PKGBUILD b/mingw-w64-tktable/PKGBUILD
index d8710c2e19..b170efa905 100644
--- a/mingw-w64-tktable/PKGBUILD
+++ b/mingw-w64-tktable/PKGBUILD
@@ -32,9 +32,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${CARCH}" ]] && rm -rf "${srcdir}/build-${CARCH}"
-  mkdir -p "${srcdir}/build-${CARCH}"
-  cd "${srcdir}/build-${CARCH}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   [[ "${MINGW_CHOST}" = 'x86_64-w64-mingw32' ]] && enable64bit='--enable-64bit'
 
@@ -45,6 +45,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-tolua/PKGBUILD b/mingw-w64-tolua/PKGBUILD
index d37c0ccb1b..ca07d4639a 100644
--- a/mingw-w64-tolua/PKGBUILD
+++ b/mingw-w64-tolua/PKGBUILD
@@ -16,9 +16,9 @@ source=(https://www.tecgraf.puc-rio.br/~celes/tolua/${_realname}-${pkgver}.tar.g
 sha256sums=('c5a6b701b3ced9a66e7a9881c9d94430f8612040827650abe1aa3c5c3fc95bf2')
 
 build() {
-  [[ -d "${srcdir}/build-${CARCH}" ]] && rm -rf "${srcdir}/build-${CARCH}"
-  cp -rf "${srcdir}/${_realname}-${pkgver}" "${srcdir}/build-${CARCH}"  
-  cd "${srcdir}/build-${CARCH}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  cp -rf "${srcdir}/${_realname}-${pkgver}" "${srcdir}/build-${MSYSTEM}"  
+  cd "${srcdir}/build-${MSYSTEM}"
   sed -i "s|LUA=/usr/local|LUA=${MINGW_PREFIX}|g" config
   make -j1 \
     AR="ar rcu" \
@@ -28,7 +28,7 @@ build() {
 }
 
 package(){
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
   mkdir -p ${pkgdir}${MINGW_PREFIX}/{bin,lib,include}
   cp bin/*.exe ${pkgdir}${MINGW_PREFIX}/bin/
   cp lib/*.a ${pkgdir}${MINGW_PREFIX}/lib/
diff --git a/mingw-w64-totem-pl-parser/PKGBUILD b/mingw-w64-totem-pl-parser/PKGBUILD
index 16659eec3c..e9b75ee192 100644
--- a/mingw-w64-totem-pl-parser/PKGBUILD
+++ b/mingw-w64-totem-pl-parser/PKGBUILD
@@ -37,8 +37,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MINGW_CHOST} ]] && rm -rf "${srcdir}"/build-${MINGW_CHOST}
-  mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   ${MINGW_PREFIX}/bin/meson \
@@ -51,7 +51,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/ninja install
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING.LIB" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING.LIB"
diff --git a/mingw-w64-twolame/PKGBUILD b/mingw-w64-twolame/PKGBUILD
index 09aeb1a8cb..2b045eefbd 100644
--- a/mingw-w64-twolame/PKGBUILD
+++ b/mingw-w64-twolame/PKGBUILD
@@ -32,9 +32,9 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
-  mkdir -p build-${MINGW_CHOST}
-  cd build-${MINGW_CHOST}
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM}
+  cd build-${MSYSTEM}
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -46,6 +46,6 @@ build() {
 }
 
 package() {
-  cd build-${MINGW_CHOST}
+  cd build-${MSYSTEM}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-ucl/PKGBUILD b/mingw-w64-ucl/PKGBUILD
index 3a304b4d1e..f68fb3776b 100644
--- a/mingw-w64-ucl/PKGBUILD
+++ b/mingw-w64-ucl/PKGBUILD
@@ -37,8 +37,8 @@ prepare() {
 
 build() {
   cd "${srcdir}"/${_realname}-${pkgver}
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
   CFLAGS+=" -std=gnu90"
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -52,6 +52,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make install DESTDIR="${pkgdir}"
 }
diff --git a/mingw-w64-udis86/PKGBUILD b/mingw-w64-udis86/PKGBUILD
index 2139ace5d5..e53af914c1 100644
--- a/mingw-w64-udis86/PKGBUILD
+++ b/mingw-w64-udis86/PKGBUILD
@@ -36,9 +36,9 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
   ../${_realname}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -47,7 +47,7 @@ build() {
 }
 
 package () {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 
   cp  ${srcdir}/${_realname}/scripts/*.py ${pkgdir}${MINGW_PREFIX}/bin/
diff --git a/mingw-w64-uhttpmock/PKGBUILD b/mingw-w64-uhttpmock/PKGBUILD
index ac795a4b39..c9b8108492 100644
--- a/mingw-w64-uhttpmock/PKGBUILD
+++ b/mingw-w64-uhttpmock/PKGBUILD
@@ -33,9 +33,9 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
-  mkdir -p build-${MINGW_CHOST}
-  cd build-${MINGW_CHOST}
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM}
+  cd build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
     --host=${MINGW_CHOST} \
@@ -48,7 +48,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"
diff --git a/mingw-w64-usbview-git/PKGBUILD b/mingw-w64-usbview-git/PKGBUILD
index 05d8cc6a80..9e918b8222 100644
--- a/mingw-w64-usbview-git/PKGBUILD
+++ b/mingw-w64-usbview-git/PKGBUILD
@@ -62,8 +62,8 @@ prepare() {
 
 build() {
   cd "${srcdir}"
-  mkdir -p "build-${MINGW_CHOST}/include"
-  cd "build-${MINGW_CHOST}"
+  mkdir -p "build-${MSYSTEM}/include"
+  cd "build-${MSYSTEM}"
 
   # Make sure mingw-w64's usb.h takes precedence over libusb-compat's.
   cp ${MINGW_PREFIX}/include/usb.h include
@@ -83,7 +83,7 @@ build() {
 package() {
   cd "${srcdir}/wds"
   install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   mkdir "${pkgdir}${MINGW_PREFIX}/bin"
   install -Dm755 usbview.exe "${pkgdir}${MINGW_PREFIX}/bin"
 }
diff --git a/mingw-w64-usrsctp/PKGBUILD b/mingw-w64-usrsctp/PKGBUILD
index 28f7e1fb13..0f5f1f64b9 100644
--- a/mingw-w64-usrsctp/PKGBUILD
+++ b/mingw-w64-usrsctp/PKGBUILD
@@ -34,8 +34,8 @@ build() {
     extra_config+=("")
   fi
 
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   meson \
@@ -46,7 +46,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   DESTDIR="${pkgdir}" ninja install
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE.md" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE.md"
diff --git a/mingw-w64-vamp-plugin-sdk/PKGBUILD b/mingw-w64-vamp-plugin-sdk/PKGBUILD
index 6ae7616a72..cc2e27cd1c 100644
--- a/mingw-w64-vamp-plugin-sdk/PKGBUILD
+++ b/mingw-w64-vamp-plugin-sdk/PKGBUILD
@@ -32,9 +32,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
-  cp -rf "${_realname}-${pkgver}" "build-${MINGW_CHOST}"
-  cd build-${MINGW_CHOST}
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
+  cp -rf "${_realname}-${pkgver}" "build-${MSYSTEM}"
+  cd build-${MSYSTEM}
 
   CFLAGS+=" -D_USE_MATH_DEFINES"
   CPPFLAGS+=" -D_USE_MATH_DEFINES"
@@ -48,6 +48,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build-${MINGW_CHOST}
+  cd ${srcdir}/build-${MSYSTEM}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-vcdimager/PKGBUILD b/mingw-w64-vcdimager/PKGBUILD
index e94d8443e8..f5fdce86a4 100644
--- a/mingw-w64-vcdimager/PKGBUILD
+++ b/mingw-w64-vcdimager/PKGBUILD
@@ -31,8 +31,8 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
-  mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -46,6 +46,6 @@ build() {
 }
 
 package() {
-  cd build-${MINGW_CHOST}
+  cd build-${MSYSTEM}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-vo-amrwbenc/PKGBUILD b/mingw-w64-vo-amrwbenc/PKGBUILD
index 5aa1f54319..bd932130f3 100644
--- a/mingw-w64-vo-amrwbenc/PKGBUILD
+++ b/mingw-w64-vo-amrwbenc/PKGBUILD
@@ -22,8 +22,8 @@ prepare() {
 
 build() {
   cd "${srcdir}"/${_realname}-${pkgver}
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -36,6 +36,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make install DESTDIR="${pkgdir}"
 }
diff --git a/mingw-w64-webrtc-audio-processing/PKGBUILD b/mingw-w64-webrtc-audio-processing/PKGBUILD
index e8bcb990e7..252512ae73 100644
--- a/mingw-w64-webrtc-audio-processing/PKGBUILD
+++ b/mingw-w64-webrtc-audio-processing/PKGBUILD
@@ -31,8 +31,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-v${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -45,7 +45,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 
   cd "${srcdir}/${_realname}-v${pkgver}"
diff --git a/mingw-w64-windows-default-manifest/PKGBUILD b/mingw-w64-windows-default-manifest/PKGBUILD
index 0953544f3e..9d4be922ad 100644
--- a/mingw-w64-windows-default-manifest/PKGBUILD
+++ b/mingw-w64-windows-default-manifest/PKGBUILD
@@ -16,9 +16,9 @@ source=("git+https://sourceware.org/git/cygwin-apps/${_realname}.git#tag=${_GIT_
 sha256sums=('SKIP')
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  cp -rf ${srcdir}/${_realname} ${srcdir}/build-${MINGW_CHOST}
-  cd ${srcdir}/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  cp -rf ${srcdir}/${_realname} ${srcdir}/build-${MSYSTEM}
+  cd ${srcdir}/build-${MSYSTEM}
   ./configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -28,6 +28,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build-${MINGW_CHOST}
+  cd ${srcdir}/build-${MSYSTEM}
   make DESTDIR=${pkgdir} install
 }
diff --git a/mingw-w64-winico/PKGBUILD b/mingw-w64-winico/PKGBUILD
index 556ad2c191..b5496222ee 100644
--- a/mingw-w64-winico/PKGBUILD
+++ b/mingw-w64-winico/PKGBUILD
@@ -28,8 +28,8 @@ prepare() {
 }
 
 build() {
-  mkdir -p "${srcdir}/build-${CARCH}"
-  cd "${srcdir}/build-${CARCH}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   source ${MINGW_PREFIX}/lib/tclConfig.sh
   source ${MINGW_PREFIX}/lib/tkConfig.sh
@@ -42,7 +42,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
   _dst="$pkgdir/$MINGW_PREFIX/lib/winico${pkgver}"
   mkdir -p $_dst
   cp *.dll $_dst
diff --git a/mingw-w64-x264/PKGBUILD b/mingw-w64-x264/PKGBUILD
index 7e613572a4..9b2d814d36 100644
--- a/mingw-w64-x264/PKGBUILD
+++ b/mingw-w64-x264/PKGBUILD
@@ -43,9 +43,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
   ../${_realname}/configure \
     --prefix=${MINGW_PREFIX} \
     --host=${MINGW_CHOST} \
diff --git a/mingw-w64-x265/PKGBUILD b/mingw-w64-x265/PKGBUILD
index 9ba83db3ea..d42bb6a4f3 100644
--- a/mingw-w64-x265/PKGBUILD
+++ b/mingw-w64-x265/PKGBUILD
@@ -31,10 +31,10 @@ prepare() {
   cd "${srcdir}"/x265_${pkgver}
 
   for d in 8 10 12; do
-    if [[ -d ${srcdir}/build-${CARCH}-${d} ]]; then
-      rm -rf ${srcdir}/build-${CARCH}-${d}
+    if [[ -d ${srcdir}/build-${MSYSTEM}-${d} ]]; then
+      rm -rf ${srcdir}/build-${MSYSTEM}-${d}
     fi
-    mkdir -p ${srcdir}/build-${CARCH}-${d}
+    mkdir -p ${srcdir}/build-${MSYSTEM}-${d}
   done
 }
 
@@ -47,7 +47,7 @@ build() {
   fi
 
   # 12-bit
-  cd "${srcdir}/build-${CARCH}-12"
+  cd "${srcdir}/build-${MSYSTEM}-12"
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
     -G Ninja \
@@ -62,7 +62,7 @@ build() {
   ${MINGW_PREFIX}/bin/cmake.exe --build .
 
   # 10-bit
-  cd "${srcdir}/build-${CARCH}-10"
+  cd "${srcdir}/build-${MSYSTEM}-10"
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
     -G Ninja \
@@ -76,9 +76,9 @@ build() {
   ${MINGW_PREFIX}/bin/cmake.exe --build .
 
   # 8-bit
-  cd "${srcdir}/build-${CARCH}-8"
-  ln -s ../build-${CARCH}-10/libx265.a libx265_main10.a
-  ln -s ../build-${CARCH}-12/libx265.a libx265_main12.a
+  cd "${srcdir}/build-${MSYSTEM}-8"
+  ln -s ../build-${MSYSTEM}-10/libx265.a libx265_main10.a
+  ln -s ../build-${MSYSTEM}-12/libx265.a libx265_main12.a
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
     -G Ninja \
@@ -107,7 +107,7 @@ EOF
 }
 
 package() {
-  cd "${srcdir}/build-${CARCH}-8"
+  cd "${srcdir}/build-${MSYSTEM}-8"
 
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install .
 
diff --git a/mingw-w64-xavs/PKGBUILD b/mingw-w64-xavs/PKGBUILD
index 56bfb3f04c..d3aed3dbf4 100644
--- a/mingw-w64-xavs/PKGBUILD
+++ b/mingw-w64-xavs/PKGBUILD
@@ -26,9 +26,9 @@ prepare(){
 }
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
-  cp -r "${srcdir}/${_realname}-${pkgver}" "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
+  cp -r "${srcdir}/${_realname}-${pkgver}" "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   ./configure \
     --prefix=${MINGW_PREFIX} \
@@ -40,6 +40,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR=${pkgdir} install
 }
diff --git a/mingw-w64-xvidcore/PKGBUILD b/mingw-w64-xvidcore/PKGBUILD
index bbe497b74c..3a30fb261d 100644
--- a/mingw-w64-xvidcore/PKGBUILD
+++ b/mingw-w64-xvidcore/PKGBUILD
@@ -26,10 +26,10 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  cp -rf ${srcdir}/${_realname} ${srcdir}/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  cp -rf ${srcdir}/${_realname} ${srcdir}/build-${MSYSTEM}
 
-  cd ${srcdir}/build-${MINGW_CHOST}/build/generic
+  cd ${srcdir}/build-${MSYSTEM}/build/generic
   ./configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -39,7 +39,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build-${MINGW_CHOST}/build/generic
+  cd ${srcdir}/build-${MSYSTEM}/build/generic
   make DESTDIR="${pkgdir}" install
 
   # add lib prefix with static and import library name (#18553)
diff --git a/mingw-w64-yajl/PKGBUILD b/mingw-w64-yajl/PKGBUILD
index d8d6b980ec..83016e9b90 100644
--- a/mingw-w64-yajl/PKGBUILD
+++ b/mingw-w64-yajl/PKGBUILD
@@ -28,8 +28,8 @@ prepare() {
   patch -p1 -i "${srcdir}/02-fix-tests.patch"
 }
 build() {
-  mkdir -p "${srcdir}/build-${CARCH}"
-  cd "${srcdir}/build-${CARCH}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
@@ -41,13 +41,13 @@ build() {
   make
 }
 check() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   make test
-  PATH="$PATH:${srcdir}/build-${CARCH}/${_realname}-${pkgver}/lib" make test-api
+  PATH="$PATH:${srcdir}/build-${MSYSTEM}/${_realname}-${pkgver}/lib" make test-api
 }
 package() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
   
   make DESTDIR=${pkgdir} install  
   mv ${pkgdir}${MINGW_PREFIX}/lib/*.dll ${pkgdir}${MINGW_PREFIX}/bin/
diff --git a/mingw-w64-yasm/PKGBUILD b/mingw-w64-yasm/PKGBUILD
index dbb66c92a5..6d55a3cc6d 100644
--- a/mingw-w64-yasm/PKGBUILD
+++ b/mingw-w64-yasm/PKGBUILD
@@ -27,8 +27,8 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -38,7 +38,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"
   install -Dm644 ${srcdir}/${_realname}-${pkgver}/BSD.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/BSD.txt"
diff --git a/mingw-w64-yubico-c/PKGBUILD b/mingw-w64-yubico-c/PKGBUILD
index 212294cc09..a03524f585 100644
--- a/mingw-w64-yubico-c/PKGBUILD
+++ b/mingw-w64-yubico-c/PKGBUILD
@@ -28,8 +28,8 @@ prepare() {
 
 build() {
   cd "${srcdir}"/${_shortname}-${pkgver}
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   ../${_shortname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -43,13 +43,13 @@ 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}"
 
diff --git a/mingw-w64-zimg/PKGBUILD b/mingw-w64-zimg/PKGBUILD
index 3e5358e3a6..d19f2b0f5a 100644
--- a/mingw-w64-zimg/PKGBUILD
+++ b/mingw-w64-zimg/PKGBUILD
@@ -29,9 +29,9 @@ prepare(){
 }
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-release-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -45,6 +45,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR=${pkgdir} install
 }
diff --git a/mingw-w64-zopfli/PKGBUILD b/mingw-w64-zopfli/PKGBUILD
index 80adebced1..d470834814 100644
--- a/mingw-w64-zopfli/PKGBUILD
+++ b/mingw-w64-zopfli/PKGBUILD
@@ -51,8 +51,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${CARCH}-shared ]] && rm -rf "${srcdir}"/build-${CARCH}-shared
-  mkdir -p "${srcdir}"/build-${CARCH}-shared && cd "${srcdir}"/build-${CARCH}-shared
+  [[ -d "${srcdir}"/build-${MSYSTEM}-shared ]] && rm -rf "${srcdir}"/build-${MSYSTEM}-shared
+  mkdir -p "${srcdir}"/build-${MSYSTEM}-shared && cd "${srcdir}"/build-${MSYSTEM}-shared
 
   declare -a extra_config
   if check_option "debug" "n"; then
@@ -70,8 +70,8 @@ build() {
       ../zopfli-zopfli-${pkgver}
   make
 
-  [[ -d "${srcdir}"/build-${CARCH}-static ]] && rm -rf "${srcdir}"/build-${CARCH}-static
-  mkdir -p "${srcdir}"/build-${CARCH}-static && cd "${srcdir}"/build-${CARCH}-static
+  [[ -d "${srcdir}"/build-${MSYSTEM}-static ]] && rm -rf "${srcdir}"/build-${MSYSTEM}-static
+  mkdir -p "${srcdir}"/build-${MSYSTEM}-static && cd "${srcdir}"/build-${MSYSTEM}-static
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     ${MINGW_PREFIX}/bin/cmake \
       -G'MSYS Makefiles' \
@@ -84,7 +84,7 @@ build() {
 
 package() {
   #shared
-  cd "${srcdir}"/build-${CARCH}-shared
+  cd "${srcdir}"/build-${MSYSTEM}-shared
   # -- zopfli
   install -Dm755 "zopfli.exe" "${pkgdir}${MINGW_PREFIX}/bin/zopfli.exe"
   install -Dm644 "../zopfli-zopfli-${pkgver}/src/zopfli/zopfli.h" "${pkgdir}${MINGW_PREFIX}/include/zopfli.h"
@@ -99,7 +99,7 @@ package() {
   install -Dm755 "libzopflipng.dll.a" "${pkgdir}${MINGW_PREFIX}/lib/libzopflipng.dll.a"
 
   #static
-  cd "${srcdir}"/build-${CARCH}-static
+  cd "${srcdir}"/build-${MSYSTEM}-static
   #  -- zopfli
   install -Dm644 "libzopfli.a" "${pkgdir}${MINGW_PREFIX}/lib/libzopfli.a"
   install -Dm644 "../zopfli-zopfli-${pkgver}/README" "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}/README"
diff --git a/mingw-w64-zziplib/PKGBUILD b/mingw-w64-zziplib/PKGBUILD
index d3591d7455..bf8f87fc2f 100644
--- a/mingw-w64-zziplib/PKGBUILD
+++ b/mingw-w64-zziplib/PKGBUILD
@@ -48,8 +48,8 @@ build() {
   fi
 
   echo "Building static library"
-  [[ -d "${srcdir}/build-${CARCH}-static" ]] && rm -rf "${srcdir}/build-${CARCH}-static"
-  mkdir -p "${srcdir}/build-${CARCH}-static" && cd "${srcdir}/build-${CARCH}-static"
+  [[ -d "${srcdir}/build-${MSYSTEM}-static" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-static"
+  mkdir -p "${srcdir}/build-${MSYSTEM}-static" && cd "${srcdir}/build-${MSYSTEM}-static"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     ${MINGW_PREFIX}/bin/cmake.exe \
@@ -63,8 +63,8 @@ build() {
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
 
   echo "Building shared library"
-  [[ -d "${srcdir}/build-${CARCH}-shared" ]] && rm -rf "${srcdir}/build-${CARCH}-shared"
-  mkdir -p "${srcdir}/build-${CARCH}-shared" && cd "${srcdir}/build-${CARCH}-shared"
+  [[ -d "${srcdir}/build-${MSYSTEM}-shared" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-shared"
+  mkdir -p "${srcdir}/build-${MSYSTEM}-shared" && cd "${srcdir}/build-${MSYSTEM}-shared"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     ${MINGW_PREFIX}/bin/cmake.exe \
@@ -79,10 +79,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}/COPYING.LIB" \