diff --git a/mingw-w64-SDL/PKGBUILD b/mingw-w64-SDL/PKGBUILD
index 6cbb0a3df01e7..c793cc4a330d7 100644
--- a/mingw-w64-SDL/PKGBUILD
+++ b/mingw-w64-SDL/PKGBUILD
@@ -34,9 +34,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
   ../SDL-1.2/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-SDL2_gfx/PKGBUILD b/mingw-w64-SDL2_gfx/PKGBUILD
index e8a112063b247..05991b8a9f26f 100644
--- a/mingw-w64-SDL2_gfx/PKGBUILD
+++ b/mingw-w64-SDL2_gfx/PKGBUILD
@@ -21,9 +21,9 @@ prepare() {
 }
 
 build() {
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
   export lt_cv_deplibs_check_method='pass_all'
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
 
   local extra_config=""
   case "${CARCH}" in
@@ -34,7 +34,6 @@ build() {
       ;;
   esac
 
-  cd "${srcdir}/build-${MSYSTEM}"
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-SDL2_mixer/PKGBUILD b/mingw-w64-SDL2_mixer/PKGBUILD
index 32b2daba5af29..04f2d761a84ed 100644
--- a/mingw-w64-SDL2_mixer/PKGBUILD
+++ b/mingw-w64-SDL2_mixer/PKGBUILD
@@ -47,7 +47,6 @@ build() {
     --disable-music-opus-shared
   )
 
-  [[ -d "${srcdir}/build-${MSYSTEM}-static" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-static"
   mkdir -p "${srcdir}/build-${MSYSTEM}-static" && cd "${srcdir}/build-${MSYSTEM}-static"
 
   CPPFLAGS+=" -DFLAC__NO_DLL -DMODPLUG_STATIC" \
@@ -61,7 +60,6 @@ build() {
 
   make
 
-  [[ -d "${srcdir}/build-${MSYSTEM}-shared" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-shared"
   mkdir -p "${srcdir}/build-${MSYSTEM}-shared" && cd "${srcdir}/build-${MSYSTEM}-shared"
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-SDL_gfx/PKGBUILD b/mingw-w64-SDL_gfx/PKGBUILD
index e8d0b24845737..71edf641b9670 100644
--- a/mingw-w64-SDL_gfx/PKGBUILD
+++ b/mingw-w64-SDL_gfx/PKGBUILD
@@ -21,9 +21,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   declare -a _extra_config
 
diff --git a/mingw-w64-SDL_image/PKGBUILD b/mingw-w64-SDL_image/PKGBUILD
index c138d7222fa69..2de76aaaf2981 100644
--- a/mingw-w64-SDL_image/PKGBUILD
+++ b/mingw-w64-SDL_image/PKGBUILD
@@ -34,9 +34,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   export lt_cv_deplibs_check_method='pass_all'
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-SDL_mixer/PKGBUILD b/mingw-w64-SDL_mixer/PKGBUILD
index 9d32564a48bd1..b625a32578882 100644
--- a/mingw-w64-SDL_mixer/PKGBUILD
+++ b/mingw-w64-SDL_mixer/PKGBUILD
@@ -63,9 +63,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   export lt_cv_deplibs_check_method='pass_all'
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-SDL_net/PKGBUILD b/mingw-w64-SDL_net/PKGBUILD
index 47f27327e65f4..732ca7692d1aa 100644
--- a/mingw-w64-SDL_net/PKGBUILD
+++ b/mingw-w64-SDL_net/PKGBUILD
@@ -16,9 +16,8 @@ source=(https://libsdl.org/projects/SDL_net/release/${_realname}-${pkgver}.tar.g
 sha256sums=('5f4a7a8bb884f793c278ac3f3713be41980c5eedccecff0260411347714facb4')
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-SDL_ttf/PKGBUILD b/mingw-w64-SDL_ttf/PKGBUILD
index 473e5f589302d..0659b5385a002 100644
--- a/mingw-w64-SDL_ttf/PKGBUILD
+++ b/mingw-w64-SDL_ttf/PKGBUILD
@@ -38,7 +38,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-a52dec/PKGBUILD b/mingw-w64-a52dec/PKGBUILD
index 1309cbe293989..b50477dfd8b4b 100644
--- a/mingw-w64-a52dec/PKGBUILD
+++ b/mingw-w64-a52dec/PKGBUILD
@@ -30,8 +30,8 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir build-${MSYSTEM} && cd build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
+
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-ag/PKGBUILD b/mingw-w64-ag/PKGBUILD
index 8d2d9aac15563..ce70e83575bff 100644
--- a/mingw-w64-ag/PKGBUILD
+++ b/mingw-w64-ag/PKGBUILD
@@ -79,7 +79,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   "${srcdir}"/${_longname}-${pkgver}/configure \
@@ -92,5 +91,6 @@ build() {
 package() {
   cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
-  install -Dm644 "${srcdir}"/${_longname}-${pkgver}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
+  install -Dm644 "${srcdir}"/${_longname}-${pkgver}/LICENSE \
+    ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
 }
diff --git a/mingw-w64-akira/PKGBUILD b/mingw-w64-akira/PKGBUILD
index 0871667e913dd..f958c1fbcbe2a 100644
--- a/mingw-w64-akira/PKGBUILD
+++ b/mingw-w64-akira/PKGBUILD
@@ -32,9 +32,7 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir -p build-${MSYSTEM}
-  cd build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   meson \
diff --git a/mingw-w64-alure/PKGBUILD b/mingw-w64-alure/PKGBUILD
index c0bf8c5df7f2d..ea5a8e64891a4 100644
--- a/mingw-w64-alure/PKGBUILD
+++ b/mingw-w64-alure/PKGBUILD
@@ -40,9 +40,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
diff --git a/mingw-w64-alure2/PKGBUILD b/mingw-w64-alure2/PKGBUILD
index 05d1215e4be30..2207d3536e772 100644
--- a/mingw-w64-alure2/PKGBUILD
+++ b/mingw-w64-alure2/PKGBUILD
@@ -36,9 +36,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
diff --git a/mingw-w64-aom/PKGBUILD b/mingw-w64-aom/PKGBUILD
index 57bd73013d042..5104ef9e38efd 100644
--- a/mingw-w64-aom/PKGBUILD
+++ b/mingw-w64-aom/PKGBUILD
@@ -28,7 +28,6 @@ sha256sums=('cf7d103d2798e512aca9c6e7353d7ebf8967ee96fffe9946e015bb9947903e3e'
 validpgpkeys=('B002F08B74A148DAA01F7123A48E86DB0B830498') # AOMedia release signing key <av1-discuss@aomedia.org>
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   declare -a extra_config
diff --git a/mingw-w64-argtable/PKGBUILD b/mingw-w64-argtable/PKGBUILD
index 21104cfaced0b..51acb27acb24d 100644
--- a/mingw-w64-argtable/PKGBUILD
+++ b/mingw-w64-argtable/PKGBUILD
@@ -30,8 +30,8 @@ prepare() {
 }
 
 build() {
-  [[ -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} \
diff --git a/mingw-w64-aribb24/PKGBUILD b/mingw-w64-aribb24/PKGBUILD
index 07a09c40918e8..b86ac740989a8 100644
--- a/mingw-w64-aribb24/PKGBUILD
+++ b/mingw-w64-aribb24/PKGBUILD
@@ -25,8 +25,8 @@ prepare() {
 }
 
 build() {
-  [[ -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} \
diff --git a/mingw-w64-asmjit/PKGBUILD b/mingw-w64-asmjit/PKGBUILD
index 498dc73cad7fd..106cb2af89298 100644
--- a/mingw-w64-asmjit/PKGBUILD
+++ b/mingw-w64-asmjit/PKGBUILD
@@ -28,7 +28,6 @@ pkgver() {
 }
 
 build() {
-  [[ -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=" \
diff --git a/mingw-w64-avr-libc/PKGBUILD b/mingw-w64-avr-libc/PKGBUILD
index df4e5951c7cc4..c098c11b8b777 100644
--- a/mingw-w64-avr-libc/PKGBUILD
+++ b/mingw-w64-avr-libc/PKGBUILD
@@ -22,7 +22,6 @@ sha256sums=('0b84cee5c08b5d5cba67c36125e5aaa85251bc9accfba5773bfa87bc34b654e8'
 validpgpkeys=('56628323218C669FF578705C7E9EADC3030D34EB')
 
 build() {
-    [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
     mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
     CC=avr-gcc
@@ -30,6 +29,7 @@ build() {
         --build=${MINGW_CHOST} \
         --host=${_target} \
         --prefix=${MINGW_PREFIX}
+
     make
 }
 
diff --git a/mingw-w64-aws-c-compression/PKGBUILD b/mingw-w64-aws-c-compression/PKGBUILD
index c9a7fa9b39088..7da26ff99c52d 100644
--- a/mingw-w64-aws-c-compression/PKGBUILD
+++ b/mingw-w64-aws-c-compression/PKGBUILD
@@ -26,7 +26,6 @@ build() {
   fi
 
   echo "Building static library"
-  [[ -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=" \
@@ -41,7 +40,6 @@ build() {
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
 
   echo "Building shared library"
-  [[ -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=" \
diff --git a/mingw-w64-babl/PKGBUILD b/mingw-w64-babl/PKGBUILD
index b3fe4f0e101d0..96b4e4b16cff7 100644
--- a/mingw-w64-babl/PKGBUILD
+++ b/mingw-w64-babl/PKGBUILD
@@ -42,7 +42,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   if [ "${CARCH}" = "i686" ]; then
diff --git a/mingw-w64-bin2header/PKGBUILD b/mingw-w64-bin2header/PKGBUILD
index d4b0b520b58f3..16499c6025670 100644
--- a/mingw-w64-bin2header/PKGBUILD
+++ b/mingw-w64-bin2header/PKGBUILD
@@ -18,7 +18,6 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-ninja")
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   declare -a extra_config
diff --git a/mingw-w64-binaryen/PKGBUILD b/mingw-w64-binaryen/PKGBUILD
index fe70234e46197..815a5f3f85a82 100644
--- a/mingw-w64-binaryen/PKGBUILD
+++ b/mingw-w64-binaryen/PKGBUILD
@@ -22,7 +22,6 @@ source=("${_realname}-${pkgver}.tar.gz::https://github.com/WebAssembly/binaryen/
 sha256sums=('93f3b3d62def4aee6d09b11e6de75b955d29bc37878117e4ed30c3057a2ca4b4')
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   declare -a extra_config
diff --git a/mingw-w64-box2d/PKGBUILD b/mingw-w64-box2d/PKGBUILD
index 4682d10a3b79e..dee1ac4058678 100644
--- a/mingw-w64-box2d/PKGBUILD
+++ b/mingw-w64-box2d/PKGBUILD
@@ -20,7 +20,6 @@ sha256sums=('64ad759006cd2377c99367f51fb36942b57f0e9ad690ed41548dd620e6f6c8b1')
 options=(!buildflags !strip)
 
 build() {
-  [[ -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=" \
@@ -36,7 +35,6 @@ build() {
 
   ${MINGW_PREFIX}/bin/cmake.exe --build .
 
-  [[ -d "${srcdir}/static-${MSYSTEM}" ]] && rm -rf "${srcdir}/static-${MSYSTEM}"
   mkdir -p "${srcdir}/static-${MSYSTEM}" && cd "${srcdir}/static-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
diff --git a/mingw-w64-bsdfprocessor/PKGBUILD b/mingw-w64-bsdfprocessor/PKGBUILD
index 3b8b4aedbf943..1be825b025523 100644
--- a/mingw-w64-bsdfprocessor/PKGBUILD
+++ b/mingw-w64-bsdfprocessor/PKGBUILD
@@ -31,8 +31,7 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir build-${MSYSTEM} && cd build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
diff --git a/mingw-w64-cantarell-fonts/PKGBUILD b/mingw-w64-cantarell-fonts/PKGBUILD
index 3f78496a1e712..a6723510b1cf5 100644
--- a/mingw-w64-cantarell-fonts/PKGBUILD
+++ b/mingw-w64-cantarell-fonts/PKGBUILD
@@ -22,8 +22,8 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
+
   cp -r "../${_realname}-$pkgver/prebuilt" \
     ${srcdir}/build-${MSYSTEM}
 
diff --git a/mingw-w64-cego/PKGBUILD b/mingw-w64-cego/PKGBUILD
index d6edbe8211891..0f325d5890769 100644
--- a/mingw-w64-cego/PKGBUILD
+++ b/mingw-w64-cego/PKGBUILD
@@ -23,9 +23,8 @@ prepare() {
 }
 
 build() {
-  cd "$srcdir"/${_realname}-${pkgver}
-  [[ -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} \
diff --git a/mingw-w64-cfitsio/PKGBUILD b/mingw-w64-cfitsio/PKGBUILD
index 2a91547211d82..c97fd9b1a0d80 100644
--- a/mingw-w64-cfitsio/PKGBUILD
+++ b/mingw-w64-cfitsio/PKGBUILD
@@ -43,8 +43,7 @@ build() {
   fi
 
   msg "Build static library"
-  [[ -d ${srcdir}/static-${MSYSTEM} ]] && rm -rf ${srcdir}/static-${MSYSTEM}
-  mkdir ${srcdir}/static-${MSYSTEM} && cd "${srcdir}/static-${MSYSTEM}"
+  mkdir -p ${srcdir}/static-${MSYSTEM} && cd "${srcdir}/static-${MSYSTEM}"
 
   CFLAGS+=" -D_LARGEFILE_SOURCE=ON -D_FILE_OFFSET_BITS=64" \
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX" \
@@ -59,8 +58,7 @@ build() {
   ${MINGW_PREFIX}/bin/cmake --build .
 
   msg "Build shared library"
-  [[ -d ${srcdir}/shared-${MSYSTEM} ]] && rm -rf ${srcdir}/shared-${MSYSTEM}
-  mkdir ${srcdir}/shared-${MSYSTEM} && cd "${srcdir}/shared-${MSYSTEM}"
+  mkdir -p ${srcdir}/shared-${MSYSTEM} && cd "${srcdir}/shared-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX" \
   CFLAGS+=" -D_LARGEFILE_SOURCE=ON -D_FILE_OFFSET_BITS=64" \
diff --git a/mingw-w64-cglm/PKGBUILD b/mingw-w64-cglm/PKGBUILD
index b2b806022a167..eac18de463f9a 100644
--- a/mingw-w64-cglm/PKGBUILD
+++ b/mingw-w64-cglm/PKGBUILD
@@ -20,7 +20,6 @@ source=("${_realname}-${pkgver}.tar.gz::https://github.com/recp/cglm/archive/v${
 sha256sums=('101376d9f5db7139a54db35ccc439e40b679bc2efb756d3469d39ee38e69c41b')
 
 build() {
-  [[ -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=" \
@@ -34,7 +33,6 @@ build() {
     ../${_realname}-${pkgver}
   cmake --build .
 
-  [[ -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=" \
diff --git a/mingw-w64-charls/PKGBUILD b/mingw-w64-charls/PKGBUILD
index 68a3998ea0165..217a3ef578de5 100644
--- a/mingw-w64-charls/PKGBUILD
+++ b/mingw-w64-charls/PKGBUILD
@@ -26,7 +26,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   declare -a extra_config
diff --git a/mingw-w64-check/PKGBUILD b/mingw-w64-check/PKGBUILD
index c381bfa338b8f..3d291cbbffac8 100644
--- a/mingw-w64-check/PKGBUILD
+++ b/mingw-w64-check/PKGBUILD
@@ -17,7 +17,6 @@ source=(https://github.com/libcheck/check/releases/download/${pkgver}/${_realnam
 sha256sums=('a8de4e0bacfb4d76dd1c618ded263523b53b85d92a146d8835eb1a52932fa20a')
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-chromaprint/PKGBUILD b/mingw-w64-chromaprint/PKGBUILD
index f4f0d80e2b201..a5323bcafe159 100644
--- a/mingw-w64-chromaprint/PKGBUILD
+++ b/mingw-w64-chromaprint/PKGBUILD
@@ -33,7 +33,6 @@ build() {
   )
 
   msg "Build static version"
-  [[ -d "${srcdir}/static-${MSYSTEM}" ]] && rm -r "${srcdir}/static-${MSYSTEM}"
   mkdir -p "${srcdir}/static-${MSYSTEM}" && cd "${srcdir}/static-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
@@ -46,7 +45,6 @@ build() {
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
 
   msg "Build shared version"
-  [[ -d "${srcdir}/shared-${MSYSTEM}" ]] && rm -r "${srcdir}/shared-${MSYSTEM}"
   mkdir -p "${srcdir}/shared-${MSYSTEM}" && cd "${srcdir}/shared-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
diff --git a/mingw-w64-cogl/PKGBUILD b/mingw-w64-cogl/PKGBUILD
index 595a7491f609a..09608fc66f2df 100644
--- a/mingw-w64-cogl/PKGBUILD
+++ b/mingw-w64-cogl/PKGBUILD
@@ -34,7 +34,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   mkdir doc
diff --git a/mingw-w64-corrade/PKGBUILD b/mingw-w64-corrade/PKGBUILD
index b197c080069e4..15a73c3b4b89f 100644
--- a/mingw-w64-corrade/PKGBUILD
+++ b/mingw-w64-corrade/PKGBUILD
@@ -42,7 +42,6 @@ prepare() {
 }
 
 build() {
-    [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
     mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
     declare -a extra_config
diff --git a/mingw-w64-cpptest/PKGBUILD b/mingw-w64-cpptest/PKGBUILD
index 918d2d6711b51..7bf58453f1fd1 100644
--- a/mingw-w64-cpptest/PKGBUILD
+++ b/mingw-w64-cpptest/PKGBUILD
@@ -25,7 +25,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-cppunit/PKGBUILD b/mingw-w64-cppunit/PKGBUILD
index aeda9d328fd17..2ce2aa29696cb 100644
--- a/mingw-w64-cppunit/PKGBUILD
+++ b/mingw-w64-cppunit/PKGBUILD
@@ -23,8 +23,8 @@ prepare() {
 }
 
 build() {
-  [[ -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} \
diff --git a/mingw-w64-cpputest/PKGBUILD b/mingw-w64-cpputest/PKGBUILD
index 21c27d317f169..03d3e2e6ff3d6 100644
--- a/mingw-w64-cpputest/PKGBUILD
+++ b/mingw-w64-cpputest/PKGBUILD
@@ -24,7 +24,6 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   declare -a extra_config
diff --git a/mingw-w64-d-feet/PKGBUILD b/mingw-w64-d-feet/PKGBUILD
index f3380c128a3c4..dd229edb8fd81 100644
--- a/mingw-w64-d-feet/PKGBUILD
+++ b/mingw-w64-d-feet/PKGBUILD
@@ -37,7 +37,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
diff --git a/mingw-w64-daala-git/PKGBUILD b/mingw-w64-daala-git/PKGBUILD
index 43c3080e0a034..a9f141c9689c3 100644
--- a/mingw-w64-daala-git/PKGBUILD
+++ b/mingw-w64-daala-git/PKGBUILD
@@ -51,9 +51,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
   ../${_realname}/configure \
     --build=${MINGW_CHOST} \
     --host=${MINGW_CHOST} \
diff --git a/mingw-w64-dbus-c++/PKGBUILD b/mingw-w64-dbus-c++/PKGBUILD
index 83f332b69bcb1..ed18034b365a6 100644
--- a/mingw-w64-dbus-c++/PKGBUILD
+++ b/mingw-w64-dbus-c++/PKGBUILD
@@ -38,10 +38,10 @@ prepare() {
 }
 
 build() {
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
+
   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-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
-  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
   ../${_srcname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-dcraw/PKGBUILD b/mingw-w64-dcraw/PKGBUILD
index 29bc79866a155..a4ddb59971717 100644
--- a/mingw-w64-dcraw/PKGBUILD
+++ b/mingw-w64-dcraw/PKGBUILD
@@ -27,7 +27,6 @@ prepare() {
 }
 
 build() {
-  [[ -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
diff --git a/mingw-w64-devcon-git/PKGBUILD b/mingw-w64-devcon-git/PKGBUILD
index 165ab854c656c..25a57373ff1e2 100644
--- a/mingw-w64-devcon-git/PKGBUILD
+++ b/mingw-w64-devcon-git/PKGBUILD
@@ -48,7 +48,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   windres ../wds/setup/devcon/devcon.rc rc.so
diff --git a/mingw-w64-devil/PKGBUILD b/mingw-w64-devil/PKGBUILD
index 0b71d7a399074..478e43ec03716 100644
--- a/mingw-w64-devil/PKGBUILD
+++ b/mingw-w64-devil/PKGBUILD
@@ -72,8 +72,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
-  mkdir "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   export OPENEXR_DIR="${MINGW_PREFIX}"
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
diff --git a/mingw-w64-diffutils/PKGBUILD b/mingw-w64-diffutils/PKGBUILD
index 79ce1a651bec9..81df394930984 100644
--- a/mingw-w64-diffutils/PKGBUILD
+++ b/mingw-w64-diffutils/PKGBUILD
@@ -45,11 +45,10 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
-  ../${_realname}-${pkgver}/configure --prefix=${MINGW_PREFIX} \
+  ../${_realname}-${pkgver}/configure \
+    --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
     --host=${MINGW_CHOST} \
     --target=${MINGW_CHOST}
diff --git a/mingw-w64-djvulibre/PKGBUILD b/mingw-w64-djvulibre/PKGBUILD
index 9f9a611ae7f6a..86bfd5e4c7571 100644
--- a/mingw-w64-djvulibre/PKGBUILD
+++ b/mingw-w64-djvulibre/PKGBUILD
@@ -31,9 +31,8 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-doctest/PKGBUILD b/mingw-w64-doctest/PKGBUILD
index 9f8d7c5fd22a8..9af03d380326e 100644
--- a/mingw-w64-doctest/PKGBUILD
+++ b/mingw-w64-doctest/PKGBUILD
@@ -15,7 +15,6 @@ source=("${url}/archive/v${pkgver}.tar.gz")
 sha256sums=('632ed2c05a7f53fa961381497bf8069093f0d6628c5f26286161fbd32a560186')
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   declare -a extra_config
diff --git a/mingw-w64-double-conversion/PKGBUILD b/mingw-w64-double-conversion/PKGBUILD
index 879dec1cc5207..2c72c4f55474b 100644
--- a/mingw-w64-double-conversion/PKGBUILD
+++ b/mingw-w64-double-conversion/PKGBUILD
@@ -19,7 +19,6 @@ sha256sums=('04ec44461850abbf33824da84978043b22554896b552c5fd11a9c5ae4b4d296e')
 
 build() {
   # 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=" \
@@ -34,7 +33,6 @@ build() {
   cmake --build .
 
   # 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=" \
diff --git a/mingw-w64-drmingw/PKGBUILD b/mingw-w64-drmingw/PKGBUILD
index 2324501b9505e..864439daf3e29 100644
--- a/mingw-w64-drmingw/PKGBUILD
+++ b/mingw-w64-drmingw/PKGBUILD
@@ -34,7 +34,6 @@ prepare() {
 }
 
 build() {
-  [[ -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=" \
diff --git a/mingw-w64-dumb/PKGBUILD b/mingw-w64-dumb/PKGBUILD
index b2eff68344ebf..91c59830bc191 100644
--- a/mingw-w64-dumb/PKGBUILD
+++ b/mingw-w64-dumb/PKGBUILD
@@ -19,10 +19,7 @@ source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/kode54/dumb/archive
 sha256sums=('99bfac926aeb8d476562303312d9f47fd05b43803050cd889b44da34a9b2a4f9')
 
 build() {
-  cd "${srcdir}"/${_realname}-${pkgver}
-  
   # Shared Build
-  [[ -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 \
@@ -37,7 +34,6 @@ build() {
   ${MINGW_PREFIX}/bin/ninja
   
   # Static Build
-  [[ -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 \
diff --git a/mingw-w64-ebook-tools/PKGBUILD b/mingw-w64-ebook-tools/PKGBUILD
index 94b2bce232c30..4c9d298a395ab 100644
--- a/mingw-w64-ebook-tools/PKGBUILD
+++ b/mingw-w64-ebook-tools/PKGBUILD
@@ -35,7 +35,6 @@ build() {
     _extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
-  [[ -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=" \
diff --git a/mingw-w64-editorconfig-qtcreator/PKGBUILD b/mingw-w64-editorconfig-qtcreator/PKGBUILD
index 261d7939ee06b..1e608c01003a0 100644
--- a/mingw-w64-editorconfig-qtcreator/PKGBUILD
+++ b/mingw-w64-editorconfig-qtcreator/PKGBUILD
@@ -29,7 +29,6 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   if check_option "debug" "y"; then
diff --git a/mingw-w64-elementary-icon-theme/PKGBUILD b/mingw-w64-elementary-icon-theme/PKGBUILD
index 36c14a34220b2..46a3a3685023b 100644
--- a/mingw-w64-elementary-icon-theme/PKGBUILD
+++ b/mingw-w64-elementary-icon-theme/PKGBUILD
@@ -30,9 +30,7 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir -p build-${MSYSTEM}
-  cd build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   ${MINGW_PREFIX}/bin/meson.exe \
diff --git a/mingw-w64-enca/PKGBUILD b/mingw-w64-enca/PKGBUILD
index 39d4ea97f6fab..de815494b39b5 100644
--- a/mingw-w64-enca/PKGBUILD
+++ b/mingw-w64-enca/PKGBUILD
@@ -28,7 +28,6 @@ prepare() {
 }
 
 build() {
-  [[ -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"
diff --git a/mingw-w64-ensmallen/PKGBUILD b/mingw-w64-ensmallen/PKGBUILD
index fcdacfaa1d294..fda6709385c21 100644
--- a/mingw-w64-ensmallen/PKGBUILD
+++ b/mingw-w64-ensmallen/PKGBUILD
@@ -24,7 +24,6 @@ prepare() {
 }
 
 build() {
-  [[ -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
diff --git a/mingw-w64-entt/PKGBUILD b/mingw-w64-entt/PKGBUILD
index 48b767cf80b34..af7961eb4ebf3 100644
--- a/mingw-w64-entt/PKGBUILD
+++ b/mingw-w64-entt/PKGBUILD
@@ -25,7 +25,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   declare -a extra_config
diff --git a/mingw-w64-expat/PKGBUILD b/mingw-w64-expat/PKGBUILD
index 52287339a49b1..53957ce493f7a 100644
--- a/mingw-w64-expat/PKGBUILD
+++ b/mingw-w64-expat/PKGBUILD
@@ -28,7 +28,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-fastjar/PKGBUILD b/mingw-w64-fastjar/PKGBUILD
index 7d57b1590f870..0f341142478a4 100644
--- a/mingw-w64-fastjar/PKGBUILD
+++ b/mingw-w64-fastjar/PKGBUILD
@@ -19,9 +19,8 @@ source=("https://download.savannah.nongnu.org/releases/${_realname}/${_realname}
 sha256sums=('f156abc5de8658f22ee8f08d7a72c88f9409ebd8c7933e9466b0842afeb2f145')
 
 build() {
-  cd "${srcdir}"/${_realname}-${pkgver}
-  [[ -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} \
diff --git a/mingw-w64-fcrackzip/PKGBUILD b/mingw-w64-fcrackzip/PKGBUILD
index ae137bb3f2a99..1baec71b4cecb 100644
--- a/mingw-w64-fcrackzip/PKGBUILD
+++ b/mingw-w64-fcrackzip/PKGBUILD
@@ -15,8 +15,6 @@ source=("http://oldhome.schmorp.de/marc/data/${_realname}-${pkgver}.tar.gz")
 sha256sums=('4a58c8cb98177514ba17ee30d28d4927918bf0bdc3c94d260adfee44d2d43850')
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   CFLAGS+=" -Wno-implicit-int"
diff --git a/mingw-w64-fdk-aac/PKGBUILD b/mingw-w64-fdk-aac/PKGBUILD
index 3f46fb6989cce..773f2eb755c02 100644
--- a/mingw-w64-fdk-aac/PKGBUILD
+++ b/mingw-w64-fdk-aac/PKGBUILD
@@ -24,9 +24,8 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}"/${_realname}-${pkgver}
-  [[ -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} \
diff --git a/mingw-w64-ffcall/PKGBUILD b/mingw-w64-ffcall/PKGBUILD
index ded75e80e942f..82b768e3457ca 100644
--- a/mingw-w64-ffcall/PKGBUILD
+++ b/mingw-w64-ffcall/PKGBUILD
@@ -18,7 +18,6 @@ source=("https://ftp.gnu.org/gnu/libffcall/lib${_realname}-${pkgver}.tar.gz")
 sha256sums=('7f422096b40498b1389093955825f141bb67ed6014249d884009463dc7846879')
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   ../lib${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-ffms2/PKGBUILD b/mingw-w64-ffms2/PKGBUILD
index 3b447e399d9c9..91cfa3464556f 100644
--- a/mingw-w64-ffms2/PKGBUILD
+++ b/mingw-w64-ffms2/PKGBUILD
@@ -27,7 +27,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-fftw/PKGBUILD b/mingw-w64-fftw/PKGBUILD
index 7714cb3201982..905e0ae3e7f53 100644
--- a/mingw-w64-fftw/PKGBUILD
+++ b/mingw-w64-fftw/PKGBUILD
@@ -48,7 +48,6 @@ prepare() {
 
 build() {
   for cur in ${precision}; do
-    [[ -d "${srcdir}"/build-${MSYSTEM}-${cur} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}-${cur}
     mkdir -p "${srcdir}"/build-${MSYSTEM}-${cur} && cd "${srcdir}"/build-${MSYSTEM}-${cur}
 
     msg "Building ${_realname} for ${cur} precision ..."
diff --git a/mingw-w64-flac/PKGBUILD b/mingw-w64-flac/PKGBUILD
index f8eeb818316d5..65fd2e0608cbb 100644
--- a/mingw-w64-flac/PKGBUILD
+++ b/mingw-w64-flac/PKGBUILD
@@ -31,7 +31,6 @@ build() {
     _extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
-  [[ -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=" \
@@ -47,7 +46,6 @@ build() {
 
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
 
-  [[ -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=" \
diff --git a/mingw-w64-flickcurl/PKGBUILD b/mingw-w64-flickcurl/PKGBUILD
index 2010ad40f24bf..2117a84c26375 100644
--- a/mingw-w64-flickcurl/PKGBUILD
+++ b/mingw-w64-flickcurl/PKGBUILD
@@ -30,7 +30,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   case ${MSYSTEM} in
diff --git a/mingw-w64-flif/PKGBUILD b/mingw-w64-flif/PKGBUILD
index 29530048635f1..77864d241b025 100644
--- a/mingw-w64-flif/PKGBUILD
+++ b/mingw-w64-flif/PKGBUILD
@@ -56,7 +56,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   declare -a extra_config
diff --git a/mingw-w64-fltk/PKGBUILD b/mingw-w64-fltk/PKGBUILD
index 94f599c361fb9..aae0a5ee29a6f 100644
--- a/mingw-w64-fltk/PKGBUILD
+++ b/mingw-w64-fltk/PKGBUILD
@@ -33,7 +33,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   declare -a _extra_config
diff --git a/mingw-w64-fontforge/PKGBUILD b/mingw-w64-fontforge/PKGBUILD
index 35bcd322c1c24..ce80a76f17f24 100644
--- a/mingw-w64-fontforge/PKGBUILD
+++ b/mingw-w64-fontforge/PKGBUILD
@@ -63,7 +63,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   declare -a _extra_config
diff --git a/mingw-w64-freealut/PKGBUILD b/mingw-w64-freealut/PKGBUILD
index fc032616dea60..74b0197298f92 100644
--- a/mingw-w64-freealut/PKGBUILD
+++ b/mingw-w64-freealut/PKGBUILD
@@ -23,7 +23,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-gavl/PKGBUILD b/mingw-w64-gavl/PKGBUILD
index a7e1d998b0fe5..1eec5f4bc6499 100644
--- a/mingw-w64-gavl/PKGBUILD
+++ b/mingw-w64-gavl/PKGBUILD
@@ -29,9 +29,7 @@ prepare(){
 }
 
 build() {
-  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-gc/PKGBUILD b/mingw-w64-gc/PKGBUILD
index c9460b51d5800..1be42c692201b 100644
--- a/mingw-w64-gc/PKGBUILD
+++ b/mingw-w64-gc/PKGBUILD
@@ -30,7 +30,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   CFLAGS+=" -fcommon" \
diff --git a/mingw-w64-gcab/PKGBUILD b/mingw-w64-gcab/PKGBUILD
index 08b92aa1c169a..c1da09f0e7e6e 100644
--- a/mingw-w64-gcab/PKGBUILD
+++ b/mingw-w64-gcab/PKGBUILD
@@ -37,7 +37,6 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
diff --git a/mingw-w64-gdbm/PKGBUILD b/mingw-w64-gdbm/PKGBUILD
index 2c6c9bf9cc6f6..5a004c9b1df0b 100644
--- a/mingw-w64-gdbm/PKGBUILD
+++ b/mingw-w64-gdbm/PKGBUILD
@@ -31,7 +31,6 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-gdl/PKGBUILD b/mingw-w64-gdl/PKGBUILD
index aba56b8d30200..d38dcc66a6ede 100644
--- a/mingw-w64-gdl/PKGBUILD
+++ b/mingw-w64-gdl/PKGBUILD
@@ -28,8 +28,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
-  mkdir "${srcdir}"/build-${MSYSTEM}  && cd "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM}  && cd "${srcdir}"/build-${MSYSTEM}
 
   mkdir -p docs/reference/html
   cp -rf ../${_realname}-${pkgver}/docs/reference/html/* docs/reference/html
diff --git a/mingw-w64-geocode-glib/PKGBUILD b/mingw-w64-geocode-glib/PKGBUILD
index 818cc9ed0fce4..f409348760634 100644
--- a/mingw-w64-geocode-glib/PKGBUILD
+++ b/mingw-w64-geocode-glib/PKGBUILD
@@ -28,7 +28,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
diff --git a/mingw-w64-geographiclib/PKGBUILD b/mingw-w64-geographiclib/PKGBUILD
index 5f7d3484bf48d..dbd7eebbe9078 100644
--- a/mingw-w64-geographiclib/PKGBUILD
+++ b/mingw-w64-geographiclib/PKGBUILD
@@ -21,7 +21,6 @@ source=(https://downloads.sourceforge.net/project/geographiclib/distrib/${_realn
 sha256sums=('5d4145cd16ebf51a2ff97c9244330a340787d131165cfd150e4b2840c0e8ac2b')
 
 build() {
-  [[ -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=" \
diff --git a/mingw-w64-geoip/PKGBUILD b/mingw-w64-geoip/PKGBUILD
index 475740329ca43..e887e5aa7e074 100644
--- a/mingw-w64-geoip/PKGBUILD
+++ b/mingw-w64-geoip/PKGBUILD
@@ -25,8 +25,8 @@ prepare(){
 }
 
 build() {
-  [[ -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} \
@@ -34,6 +34,7 @@ build() {
     --target=${MINGW_CHOST} \
     --enable-static \
     --enable-shared
+
   make
 }
 
diff --git a/mingw-w64-gflags/PKGBUILD b/mingw-w64-gflags/PKGBUILD
index 67ae2db32438a..c5da75a984a2c 100644
--- a/mingw-w64-gflags/PKGBUILD
+++ b/mingw-w64-gflags/PKGBUILD
@@ -34,7 +34,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   if check_option "debug" "n"; then
diff --git a/mingw-w64-gl2ps/PKGBUILD b/mingw-w64-gl2ps/PKGBUILD
index 2c4b57d17ef84..7f74ebe8a1d91 100644
--- a/mingw-w64-gl2ps/PKGBUILD
+++ b/mingw-w64-gl2ps/PKGBUILD
@@ -28,9 +28,7 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir build-${MSYSTEM}
-  cd build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
diff --git a/mingw-w64-glade/PKGBUILD b/mingw-w64-glade/PKGBUILD
index 0475f719b9e0e..cd16d51b8c908 100644
--- a/mingw-w64-glade/PKGBUILD
+++ b/mingw-w64-glade/PKGBUILD
@@ -38,7 +38,6 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
diff --git a/mingw-w64-glew/PKGBUILD b/mingw-w64-glew/PKGBUILD
index bc0738eac0b92..ff88b32408742 100644
--- a/mingw-w64-glew/PKGBUILD
+++ b/mingw-w64-glew/PKGBUILD
@@ -24,7 +24,6 @@ prepare() {
 }
 
 build() {
-  [[ -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=" \
diff --git a/mingw-w64-global/PKGBUILD b/mingw-w64-global/PKGBUILD
index ac879e5a91a64..5d2f265518b8d 100644
--- a/mingw-w64-global/PKGBUILD
+++ b/mingw-w64-global/PKGBUILD
@@ -34,7 +34,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   export CPPFLAGS="-I${MINGW_PREFIX}/include/ncurses"
diff --git a/mingw-w64-glsl-optimizer-git/PKGBUILD b/mingw-w64-glsl-optimizer-git/PKGBUILD
index 1d6cbb5089ce0..a85b03669feb1 100644
--- a/mingw-w64-glsl-optimizer-git/PKGBUILD
+++ b/mingw-w64-glsl-optimizer-git/PKGBUILD
@@ -46,7 +46,6 @@ prepare() {
 }
 
 build() {
-  [[ -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=" \
diff --git a/mingw-w64-gnutls/PKGBUILD b/mingw-w64-gnutls/PKGBUILD
index e752164b53de4..19405c3961dfe 100644
--- a/mingw-w64-gnutls/PKGBUILD
+++ b/mingw-w64-gnutls/PKGBUILD
@@ -76,7 +76,6 @@ build() {
   # https://github.com/msys2/MINGW-packages/issues/11743
   export gl_cv_have_weak=no
 
-  [[ -d "${srcdir}/build-${MSYSTEM}-static" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-static"
   mkdir -p "${srcdir}/build-${MSYSTEM}-static" && cd "${srcdir}/build-${MSYSTEM}-static"
 
   CPPFLAGS+=" -DIN_LIBUNISTRING" \
@@ -100,7 +99,6 @@ build() {
 
   make
 
-  [[ -d "${srcdir}/build-${MSYSTEM}-shared" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-shared"
   mkdir -p "${srcdir}/build-${MSYSTEM}-shared" && cd "${srcdir}/build-${MSYSTEM}-shared"
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-graphene/PKGBUILD b/mingw-w64-graphene/PKGBUILD
index a65fd7de0be9f..54f33d5ec4614 100644
--- a/mingw-w64-graphene/PKGBUILD
+++ b/mingw-w64-graphene/PKGBUILD
@@ -21,7 +21,6 @@ source=("${_realname}-${pkgver}.tar.gz::https://github.com/ebassi/graphene/archi
 sha256sums=('922dc109d2dc5dc56617a29bd716c79dd84db31721a8493a13a5f79109a4a4ed')
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
diff --git a/mingw-w64-graphicsmagick/PKGBUILD b/mingw-w64-graphicsmagick/PKGBUILD
index c2e48890f609c..7ff40c8f9533d 100644
--- a/mingw-w64-graphicsmagick/PKGBUILD
+++ b/mingw-w64-graphicsmagick/PKGBUILD
@@ -81,7 +81,6 @@ prepare() {
 }
 
 build() {
-  [[ -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'
diff --git a/mingw-w64-graphite2/PKGBUILD b/mingw-w64-graphite2/PKGBUILD
index 6cf31d438b5f5..2d4d78ddd3829 100644
--- a/mingw-w64-graphite2/PKGBUILD
+++ b/mingw-w64-graphite2/PKGBUILD
@@ -72,7 +72,6 @@ check() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   declare -a extra_config
diff --git a/mingw-w64-gss/PKGBUILD b/mingw-w64-gss/PKGBUILD
index 44b4f1a0d51ab..4dfbaf7ea42d9 100644
--- a/mingw-w64-gss/PKGBUILD
+++ b/mingw-w64-gss/PKGBUILD
@@ -42,9 +42,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p build-${MSYSTEM}
-  cd build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
+
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-gtk-elementary-theme/PKGBUILD b/mingw-w64-gtk-elementary-theme/PKGBUILD
index b20b1e2e82d92..c589f3c432fb1 100644
--- a/mingw-w64-gtk-elementary-theme/PKGBUILD
+++ b/mingw-w64-gtk-elementary-theme/PKGBUILD
@@ -24,7 +24,6 @@ source=(${_realname}-${pkgver}::git+https://github.com/elementary/stylesheet.git
 sha256sums=('0173a61b87f850efc2c608b2fd4e1bffb5969f404c03506ba597bec46400ce02')
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
diff --git a/mingw-w64-gtk2/PKGBUILD b/mingw-w64-gtk2/PKGBUILD
index b2d73cd4b16e4..cfdf105bcab41 100644
--- a/mingw-w64-gtk2/PKGBUILD
+++ b/mingw-w64-gtk2/PKGBUILD
@@ -86,7 +86,6 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   ../gtk+-${pkgver}/configure \
diff --git a/mingw-w64-gtkmm-4.0/PKGBUILD b/mingw-w64-gtkmm-4.0/PKGBUILD
index 89c68f1e6cd37..f0e034acccc1f 100644
--- a/mingw-w64-gtkmm-4.0/PKGBUILD
+++ b/mingw-w64-gtkmm-4.0/PKGBUILD
@@ -29,7 +29,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   declare -a _extra_config
diff --git a/mingw-w64-gtkmm3/PKGBUILD b/mingw-w64-gtkmm3/PKGBUILD
index cad833a440f46..15ceddea73634 100644
--- a/mingw-w64-gtkmm3/PKGBUILD
+++ b/mingw-w64-gtkmm3/PKGBUILD
@@ -27,7 +27,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   declare -a extra_config
diff --git a/mingw-w64-gtksourceviewmm3/PKGBUILD b/mingw-w64-gtksourceviewmm3/PKGBUILD
index 13088a59bb5e1..1c75eec8b3554 100644
--- a/mingw-w64-gtksourceviewmm3/PKGBUILD
+++ b/mingw-w64-gtksourceviewmm3/PKGBUILD
@@ -30,10 +30,11 @@ prepare() {
 
 
 build() {
-  CPPFLAGS+=" -D_REENTRANT"
-  export lt_cv_deplibs_check_method='pass_all'
-  [[ -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'
+
+  CPPFLAGS+=" -D_REENTRANT"
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-guile1.8/PKGBUILD b/mingw-w64-guile1.8/PKGBUILD
index bd6cb1c1f94b3..680fc9e1b4c10 100644
--- a/mingw-w64-guile1.8/PKGBUILD
+++ b/mingw-w64-guile1.8/PKGBUILD
@@ -99,9 +99,10 @@ prepare() {
 }
 
 build() {
-  export lt_cv_deplibs_check_method='pass_all'
-  [[ -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 \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-gxml/PKGBUILD b/mingw-w64-gxml/PKGBUILD
index 9537d6e9f78d2..99973b5c0525b 100644
--- a/mingw-w64-gxml/PKGBUILD
+++ b/mingw-w64-gxml/PKGBUILD
@@ -32,9 +32,7 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
-  mkdir -p build-${MSYSTEM}
-  cd build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   # clang error from vala generated file
   export CFLAGS="${CFLAGS} -Wno-incompatible-function-pointer-types"
diff --git a/mingw-w64-heimdall/PKGBUILD b/mingw-w64-heimdall/PKGBUILD
index da0dc4d77696f..a9f33e6324694 100644
--- a/mingw-w64-heimdall/PKGBUILD
+++ b/mingw-w64-heimdall/PKGBUILD
@@ -38,14 +38,14 @@ prepare() {
 }
 
 build() {
-
-  [[ -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 \
     -G"Ninja" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
      ../heimdall
+
   ${MINGW_PREFIX}/bin/cmake --build .
 }
 
diff --git a/mingw-w64-highway/PKGBUILD b/mingw-w64-highway/PKGBUILD
index 12caf24af8ba3..5c6b863c2ceff 100644
--- a/mingw-w64-highway/PKGBUILD
+++ b/mingw-w64-highway/PKGBUILD
@@ -38,7 +38,6 @@ build() {
   fi
 
   # Static build
-  [[ -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=" \
@@ -53,7 +52,6 @@ build() {
   ${MINGW_PREFIX}/bin/cmake --build .
 
   # Shared build
-  [[ -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=" \
diff --git a/mingw-w64-hlsl2glsl-git/PKGBUILD b/mingw-w64-hlsl2glsl-git/PKGBUILD
index eb5a553262e68..77fbc7ea69ac8 100644
--- a/mingw-w64-hlsl2glsl-git/PKGBUILD
+++ b/mingw-w64-hlsl2glsl-git/PKGBUILD
@@ -42,8 +42,7 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir build-${MSYSTEM} && cd build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX" \
     ${MINGW_PREFIX}/bin/cmake \
diff --git a/mingw-w64-hunspell/PKGBUILD b/mingw-w64-hunspell/PKGBUILD
index d11a6d98d9f03..d0caf0965c97b 100644
--- a/mingw-w64-hunspell/PKGBUILD
+++ b/mingw-w64-hunspell/PKGBUILD
@@ -59,9 +59,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   #CPPFLAGS+=" -I${MINGW_PREFIX}/include/ncurses"
   #CFLAGS+=" -I${MINGW_PREFIX}/include/ncurses"
diff --git a/mingw-w64-hwloc/PKGBUILD b/mingw-w64-hwloc/PKGBUILD
index 4650d0b1976a3..cc6c346abed64 100644
--- a/mingw-w64-hwloc/PKGBUILD
+++ b/mingw-w64-hwloc/PKGBUILD
@@ -37,7 +37,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-icoutils/PKGBUILD b/mingw-w64-icoutils/PKGBUILD
index 04563fa6945d2..a00afed63d9a8 100644
--- a/mingw-w64-icoutils/PKGBUILD
+++ b/mingw-w64-icoutils/PKGBUILD
@@ -17,7 +17,6 @@ source=(https://savannah.nongnu.org/download/${_realname}/${_realname}-${pkgver}
 sha256sums=('17abe02d043a253b68b47e3af69c9fc755b895db68fdc8811786125df564c6e0')
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-id3lib/PKGBUILD b/mingw-w64-id3lib/PKGBUILD
index 6e41fea4e79fa..8fe50ae02baab 100644
--- a/mingw-w64-id3lib/PKGBUILD
+++ b/mingw-w64-id3lib/PKGBUILD
@@ -80,7 +80,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-inja/PKGBUILD b/mingw-w64-inja/PKGBUILD
index d7dc958a1377b..d418a4e5253ae 100644
--- a/mingw-w64-inja/PKGBUILD
+++ b/mingw-w64-inja/PKGBUILD
@@ -30,7 +30,6 @@ prepare() {
 }
 
 build() {
-  [[ -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=" \
diff --git a/mingw-w64-isl/PKGBUILD b/mingw-w64-isl/PKGBUILD
index 9aca0eac83a2e..82910df29b51c 100644
--- a/mingw-w64-isl/PKGBUILD
+++ b/mingw-w64-isl/PKGBUILD
@@ -25,7 +25,6 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-jansson/PKGBUILD b/mingw-w64-jansson/PKGBUILD
index 379b6c93943d9..f2734cc49dda9 100644
--- a/mingw-w64-jansson/PKGBUILD
+++ b/mingw-w64-jansson/PKGBUILD
@@ -21,7 +21,6 @@ source=("https://github.com/akheron/${_realname}/releases/download/v${pkgver}/${
 sha256sums=('5798d010e41cf8d76b66236cfb2f2543c8d082181d16bc3085ab49538d4b9929')
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-jasper/PKGBUILD b/mingw-w64-jasper/PKGBUILD
index 10c9c8b0eb841..92dbf0edf54c8 100644
--- a/mingw-w64-jasper/PKGBUILD
+++ b/mingw-w64-jasper/PKGBUILD
@@ -58,7 +58,6 @@ build() {
   fi
 
   msg2 "Building static library"
-  [[ -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=" \
@@ -76,7 +75,6 @@ build() {
   "${MINGW_PREFIX}"/bin/cmake.exe --build .
 
   msg2 "Building shared library"
-  [[ -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=" \
diff --git a/mingw-w64-jbig2dec/PKGBUILD b/mingw-w64-jbig2dec/PKGBUILD
index 8ad9a86907e73..59b2167ec4dc4 100644
--- a/mingw-w64-jbig2dec/PKGBUILD
+++ b/mingw-w64-jbig2dec/PKGBUILD
@@ -35,8 +35,6 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  [[ -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'
diff --git a/mingw-w64-jemalloc/PKGBUILD b/mingw-w64-jemalloc/PKGBUILD
index 0664766f155a7..46aacee737484 100644
--- a/mingw-w64-jemalloc/PKGBUILD
+++ b/mingw-w64-jemalloc/PKGBUILD
@@ -45,7 +45,6 @@ build() {
     _btype=
   fi
 
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   CFLAGS+=" -std=gnu11"
diff --git a/mingw-w64-jp2-pixbuf-loader/PKGBUILD b/mingw-w64-jp2-pixbuf-loader/PKGBUILD
index 7d46451e03af7..56657b734fccc 100644
--- a/mingw-w64-jp2-pixbuf-loader/PKGBUILD
+++ b/mingw-w64-jp2-pixbuf-loader/PKGBUILD
@@ -28,7 +28,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
diff --git a/mingw-w64-jq/PKGBUILD b/mingw-w64-jq/PKGBUILD
index 2c0574a9b5b06..ddbaa67cce680 100644
--- a/mingw-w64-jq/PKGBUILD
+++ b/mingw-w64-jq/PKGBUILD
@@ -30,7 +30,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-json-c/PKGBUILD b/mingw-w64-json-c/PKGBUILD
index 804f1ecf36d4b..be660a15349bd 100644
--- a/mingw-w64-json-c/PKGBUILD
+++ b/mingw-w64-json-c/PKGBUILD
@@ -31,7 +31,6 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   declare -a _extra_config
diff --git a/mingw-w64-jsonrpc-glib/PKGBUILD b/mingw-w64-jsonrpc-glib/PKGBUILD
index c9168f1e05bc8..1fe75416c659e 100644
--- a/mingw-w64-jsonrpc-glib/PKGBUILD
+++ b/mingw-w64-jsonrpc-glib/PKGBUILD
@@ -28,7 +28,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
diff --git a/mingw-w64-jxrlib/PKGBUILD b/mingw-w64-jxrlib/PKGBUILD
index bf3cb97bf2f53..f9e137bd6f8c7 100644
--- a/mingw-w64-jxrlib/PKGBUILD
+++ b/mingw-w64-jxrlib/PKGBUILD
@@ -47,7 +47,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
  
   declare -a extra_config
diff --git a/mingw-w64-keystone/PKGBUILD b/mingw-w64-keystone/PKGBUILD
index 7c61da8d57274..be4757741ed2e 100644
--- a/mingw-w64-keystone/PKGBUILD
+++ b/mingw-w64-keystone/PKGBUILD
@@ -36,7 +36,6 @@ prepare() {
 }
 
 build() {
-  [[ -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=" \
diff --git a/mingw-w64-kseexpr/PKGBUILD b/mingw-w64-kseexpr/PKGBUILD
index bcd858f2aff3f..f5272c8c64390 100644
--- a/mingw-w64-kseexpr/PKGBUILD
+++ b/mingw-w64-kseexpr/PKGBUILD
@@ -21,9 +21,7 @@ source=("https://download.kde.org/stable/kseexpr/${pkgver%.*}/${_realname}-${pkg
 sha256sums=('ea4f6a8e820e6cc12d2a1e6977e96ea5457f37729fe0bc4ee8cc62d4c26c36ae')
 
 build() {
-  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
diff --git a/mingw-w64-ktouch/PKGBUILD b/mingw-w64-ktouch/PKGBUILD
index 08c1a68239c58..d0d53ddf2af8a 100644
--- a/mingw-w64-ktouch/PKGBUILD
+++ b/mingw-w64-ktouch/PKGBUILD
@@ -38,7 +38,6 @@ validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aac
               D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker@kde.org>
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}${_variant}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}${_variant}"
   mkdir -p "${srcdir}/build-${MSYSTEM}${_variant}" && cd "${srcdir}/build-${MSYSTEM}${_variant}"
 
   local -a extra_config
diff --git a/mingw-w64-l-smash/PKGBUILD b/mingw-w64-l-smash/PKGBUILD
index d66fbf50ab418..4d2ea0bc915d7 100644
--- a/mingw-w64-l-smash/PKGBUILD
+++ b/mingw-w64-l-smash/PKGBUILD
@@ -27,9 +27,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  mkdir -p ${srcdir}/build-${MSYSTEM}
-  cd ${srcdir}/build-${MSYSTEM}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
+
   #On clang this isn't properly detected
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-lame/PKGBUILD b/mingw-w64-lame/PKGBUILD
index 27a909f5bc1de..3814473d2f7a8 100644
--- a/mingw-w64-lame/PKGBUILD
+++ b/mingw-w64-lame/PKGBUILD
@@ -54,9 +54,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-lasem/PKGBUILD b/mingw-w64-lasem/PKGBUILD
index 7efb6c7cad58b..0fc24bd479d09 100644
--- a/mingw-w64-lasem/PKGBUILD
+++ b/mingw-w64-lasem/PKGBUILD
@@ -47,8 +47,8 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
+
   #Force intltool to use the MSYS perl version to avoid LibXML issue
   #That occurs in the Win32 version of Perl with the intltool.
   INTLTOOL_PERL=/usr/bin/perl \
diff --git a/mingw-w64-lensfun/PKGBUILD b/mingw-w64-lensfun/PKGBUILD
index 8c3bb1041c3a4..95c90fff89853 100644
--- a/mingw-w64-lensfun/PKGBUILD
+++ b/mingw-w64-lensfun/PKGBUILD
@@ -37,8 +37,7 @@ prepare(){
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
-  mkdir ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   declare -a extra_config
   if check_option "debug" "n"; then
diff --git a/mingw-w64-leocad/PKGBUILD b/mingw-w64-leocad/PKGBUILD
index a7e60ee1f4b1b..3cde101ecec38 100644
--- a/mingw-w64-leocad/PKGBUILD
+++ b/mingw-w64-leocad/PKGBUILD
@@ -47,7 +47,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="INSTALL_PREFIX=" \
diff --git a/mingw-w64-lerc/PKGBUILD b/mingw-w64-lerc/PKGBUILD
index ff936fa2f42eb..d6789d4ec46bc 100644
--- a/mingw-w64-lerc/PKGBUILD
+++ b/mingw-w64-lerc/PKGBUILD
@@ -29,7 +29,6 @@ build() {
     extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
-  [[ -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=" \
@@ -42,7 +41,6 @@ build() {
 
   ${MINGW_PREFIX}/bin/cmake --build ./
 
-  [[ -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=" \
diff --git a/mingw-w64-leveldb/PKGBUILD b/mingw-w64-leveldb/PKGBUILD
index 5aa254faccd11..e80e720ecfec2 100644
--- a/mingw-w64-leveldb/PKGBUILD
+++ b/mingw-w64-leveldb/PKGBUILD
@@ -37,7 +37,6 @@ build() {
     extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
-  [[ -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=" \
@@ -50,7 +49,6 @@ build() {
 
   ${MINGW_PREFIX}/bin/cmake --build .
 
-  [[ -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=" \
diff --git a/mingw-w64-lfcbase/PKGBUILD b/mingw-w64-lfcbase/PKGBUILD
index ad6d0b3039282..c3e21b420c08b 100644
--- a/mingw-w64-lfcbase/PKGBUILD
+++ b/mingw-w64-lfcbase/PKGBUILD
@@ -26,7 +26,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   export CXXFLAGS="-DLFCNOCURSES -DDISABLE_SYSLOG -std=gnu++14"
diff --git a/mingw-w64-lfcxml/PKGBUILD b/mingw-w64-lfcxml/PKGBUILD
index 88ff373b902e7..e3a33cb0c0d62 100644
--- a/mingw-w64-lfcxml/PKGBUILD
+++ b/mingw-w64-lfcxml/PKGBUILD
@@ -23,9 +23,8 @@ prepare() {
 }
 
 build() {
-  cd "$srcdir"/${_realname}-${pkgver}
-  [[ -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} \
diff --git a/mingw-w64-libaacs/PKGBUILD b/mingw-w64-libaacs/PKGBUILD
index 49dc1056feadc..2877d1e5adbfc 100644
--- a/mingw-w64-libaacs/PKGBUILD
+++ b/mingw-w64-libaacs/PKGBUILD
@@ -21,8 +21,6 @@ prepare() {
 }
 
 build() {
-  cd "$srcdir"/${_realname}-${pkgver}
-  [[ -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
diff --git a/mingw-w64-libao/PKGBUILD b/mingw-w64-libao/PKGBUILD
index 5256dc3b1aa88..3b75c064abe4f 100644
--- a/mingw-w64-libao/PKGBUILD
+++ b/mingw-w64-libao/PKGBUILD
@@ -24,7 +24,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   LIBS+="-lksuser" \
diff --git a/mingw-w64-libarchive/PKGBUILD b/mingw-w64-libarchive/PKGBUILD
index d3403b4d40df9..8e820a623f304 100644
--- a/mingw-w64-libarchive/PKGBUILD
+++ b/mingw-w64-libarchive/PKGBUILD
@@ -36,7 +36,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   # Mention default options explicitly to clarify any confusion
diff --git a/mingw-w64-libaribcaption/PKGBUILD b/mingw-w64-libaribcaption/PKGBUILD
index e455b8ad67c13..e157f8dbfbc4c 100644
--- a/mingw-w64-libaribcaption/PKGBUILD
+++ b/mingw-w64-libaribcaption/PKGBUILD
@@ -31,7 +31,6 @@ build() {
   fi
 
   msg2 "Building static library"
-  [[ -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=" \
@@ -45,7 +44,6 @@ build() {
   "${MINGW_PREFIX}"/bin/cmake.exe --build .
 
   msg2 "Building shared library"
-  [[ -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=" \
diff --git a/mingw-w64-libart_lgpl/PKGBUILD b/mingw-w64-libart_lgpl/PKGBUILD
index b812f568a6a26..01bd49b1862f5 100644
--- a/mingw-w64-libart_lgpl/PKGBUILD
+++ b/mingw-w64-libart_lgpl/PKGBUILD
@@ -29,8 +29,8 @@ prepare() {
 }
 
 build() {
-  [[ -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} \
diff --git a/mingw-w64-libass/PKGBUILD b/mingw-w64-libass/PKGBUILD
index 0a7fd821862fc..a06d3472baf33 100644
--- a/mingw-w64-libass/PKGBUILD
+++ b/mingw-w64-libass/PKGBUILD
@@ -33,7 +33,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}-static" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-static"
   mkdir -p "${srcdir}/build-${MSYSTEM}-static" && cd "${srcdir}/build-${MSYSTEM}-static"
 
   CPPFLAGS+=" -DFRIBIDI_LIB_STATIC" \
@@ -51,7 +50,6 @@ build() {
 
   make
 
-  [[ -d "${srcdir}/build-${MSYSTEM}-shared" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-shared"
   mkdir -p "${srcdir}/build-${MSYSTEM}-shared" && cd "${srcdir}/build-${MSYSTEM}-shared"
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-libbdplus/PKGBUILD b/mingw-w64-libbdplus/PKGBUILD
index 3a58d71599d1d..e7b6bb609b668 100644
--- a/mingw-w64-libbdplus/PKGBUILD
+++ b/mingw-w64-libbdplus/PKGBUILD
@@ -16,9 +16,8 @@ source=("https://download.videolan.org/pub/videolan/${_realname}/${pkgver}/${_re
 sha256sums=('b93eea3eaef33d6e9155d2c34b068c505493aa5a4936e63274f4342ab0f40a58')
 
 build() {
-  cd "$srcdir"/${_realname}-${pkgver}
-  [[ -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} \
diff --git a/mingw-w64-libbluray/PKGBUILD b/mingw-w64-libbluray/PKGBUILD
index ed00e020f044f..8a67d19916347 100644
--- a/mingw-w64-libbluray/PKGBUILD
+++ b/mingw-w64-libbluray/PKGBUILD
@@ -28,7 +28,6 @@ prepare() {
 build() {
   export lt_cv_deplibs_check_method='pass_all'
 
-  [[ -d "${srcdir}/build-static-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-static-${MSYSTEM}"
   mkdir -p "${srcdir}/build-static-${MSYSTEM}" && cd "${srcdir}/build-static-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
@@ -45,7 +44,6 @@ build() {
 
     make
 
-  [[ -d "${srcdir}/build-shared-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-shared-${MSYSTEM}"
   mkdir -p "${srcdir}/build-shared-${MSYSTEM}" && cd "${srcdir}/build-shared-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-libbs2b/PKGBUILD b/mingw-w64-libbs2b/PKGBUILD
index bcf0e9ebb1562..1e4be580fc2e9 100644
--- a/mingw-w64-libbs2b/PKGBUILD
+++ b/mingw-w64-libbs2b/PKGBUILD
@@ -24,8 +24,6 @@ prepare() {
 }
 
 build() {
-  cd "$srcdir"/${_realname}-${pkgver}
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-libcaca/PKGBUILD b/mingw-w64-libcaca/PKGBUILD
index 22bdc8a8f10cb..65f0b5bcc7de3 100644
--- a/mingw-w64-libcaca/PKGBUILD
+++ b/mingw-w64-libcaca/PKGBUILD
@@ -44,7 +44,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   # wrong result with ucrt
diff --git a/mingw-w64-libcddb/PKGBUILD b/mingw-w64-libcddb/PKGBUILD
index e4705415d6ca9..3ec512a70a0cc 100644
--- a/mingw-w64-libcddb/PKGBUILD
+++ b/mingw-w64-libcddb/PKGBUILD
@@ -48,8 +48,8 @@ prepare() {
 }
 
 build() {
-  [[ -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} \
diff --git a/mingw-w64-libcerf/PKGBUILD b/mingw-w64-libcerf/PKGBUILD
index 0c27ba3b19874..5a5af1fd579e0 100644
--- a/mingw-w64-libcerf/PKGBUILD
+++ b/mingw-w64-libcerf/PKGBUILD
@@ -27,7 +27,6 @@ prepare() {
 }
 
 build() {
-  [[ -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=" \
diff --git a/mingw-w64-libconfig/PKGBUILD b/mingw-w64-libconfig/PKGBUILD
index 6e238dd7628c9..0796cc665e3b1 100644
--- a/mingw-w64-libconfig/PKGBUILD
+++ b/mingw-w64-libconfig/PKGBUILD
@@ -27,7 +27,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-libcue/PKGBUILD b/mingw-w64-libcue/PKGBUILD
index d516a20e00a9d..a86515e101e3d 100644
--- a/mingw-w64-libcue/PKGBUILD
+++ b/mingw-w64-libcue/PKGBUILD
@@ -17,7 +17,6 @@ sha256sums=('cc1b3a65c60bd88b77a1ddd1574042d83cf7cc32b85fe9481c99613359eb7cfe')
 
 build() {
   echo "Building static library"
-  [[ -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=" \
@@ -31,7 +30,6 @@ build() {
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
 
   echo "Building shared library"
-  [[ -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=" \
diff --git a/mingw-w64-libdazzle/PKGBUILD b/mingw-w64-libdazzle/PKGBUILD
index b0bdacc5fab3e..8e15896f60c11 100644
--- a/mingw-w64-libdazzle/PKGBUILD
+++ b/mingw-w64-libdazzle/PKGBUILD
@@ -30,7 +30,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
diff --git a/mingw-w64-libdca/PKGBUILD b/mingw-w64-libdca/PKGBUILD
index 5e37d5ec487c9..ba96c86c592e6 100644
--- a/mingw-w64-libdca/PKGBUILD
+++ b/mingw-w64-libdca/PKGBUILD
@@ -30,7 +30,6 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-libde265/PKGBUILD b/mingw-w64-libde265/PKGBUILD
index fe2167ca1043f..e24c19c740ef6 100644
--- a/mingw-w64-libde265/PKGBUILD
+++ b/mingw-w64-libde265/PKGBUILD
@@ -37,7 +37,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   CPPFLAGS='-I$(top_srcdir)/libde265 -I$(top_srcdir) -I$(top_srcdir)/sherlock265' \
diff --git a/mingw-w64-libdiscid/PKGBUILD b/mingw-w64-libdiscid/PKGBUILD
index 344e8a5afc649..6da3af3e75464 100644
--- a/mingw-w64-libdiscid/PKGBUILD
+++ b/mingw-w64-libdiscid/PKGBUILD
@@ -24,7 +24,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-libdsm/PKGBUILD b/mingw-w64-libdsm/PKGBUILD
index 3623c47c8468f..11d24be7eec0c 100644
--- a/mingw-w64-libdsm/PKGBUILD
+++ b/mingw-w64-libdsm/PKGBUILD
@@ -28,7 +28,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   LDFLAGS+=" -lws2_32"
diff --git a/mingw-w64-libdvbpsi/PKGBUILD b/mingw-w64-libdvbpsi/PKGBUILD
index c0868eb94a54e..48180a46731a4 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-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-libdvdcss/PKGBUILD b/mingw-w64-libdvdcss/PKGBUILD
index 71528fb98e05d..bee83431b65d6 100644
--- a/mingw-w64-libdvdcss/PKGBUILD
+++ b/mingw-w64-libdvdcss/PKGBUILD
@@ -23,9 +23,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-libdvdnav/PKGBUILD b/mingw-w64-libdvdnav/PKGBUILD
index c5de27ed5e3ae..bbeef32065b77 100644
--- a/mingw-w64-libdvdnav/PKGBUILD
+++ b/mingw-w64-libdvdnav/PKGBUILD
@@ -26,9 +26,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-libebml/PKGBUILD b/mingw-w64-libebml/PKGBUILD
index 472d22a21216d..1c187f4fef341 100644
--- a/mingw-w64-libebml/PKGBUILD
+++ b/mingw-w64-libebml/PKGBUILD
@@ -36,7 +36,6 @@ build() {
     extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
-  [[ -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" \
@@ -49,7 +48,6 @@ build() {
 
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
 
-  [[ -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" \
diff --git a/mingw-w64-libelf/PKGBUILD b/mingw-w64-libelf/PKGBUILD
index 87060b1edff40..4c494a4147c72 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-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM} 
-  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM} 
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
+
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --host=${MINGW_CHOST} \
diff --git a/mingw-w64-libepoxy/PKGBUILD b/mingw-w64-libepoxy/PKGBUILD
index dd876172f3cef..8d3628382430d 100644
--- a/mingw-w64-libepoxy/PKGBUILD
+++ b/mingw-w64-libepoxy/PKGBUILD
@@ -31,7 +31,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
diff --git a/mingw-w64-libevent/PKGBUILD b/mingw-w64-libevent/PKGBUILD
index 29093c1e3fd94..52936b9092b23 100644
--- a/mingw-w64-libevent/PKGBUILD
+++ b/mingw-w64-libevent/PKGBUILD
@@ -40,7 +40,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   CFLAGS+=" -Wno-int-conversion" \
diff --git a/mingw-w64-libexif/PKGBUILD b/mingw-w64-libexif/PKGBUILD
index 1ec1c8f704234..8de08078f9c20 100644
--- a/mingw-w64-libexif/PKGBUILD
+++ b/mingw-w64-libexif/PKGBUILD
@@ -25,8 +25,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
   ../${_realname}-${_realname}-${pkgver//./_}-release/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-libgd/PKGBUILD b/mingw-w64-libgd/PKGBUILD
index 0a7e5b72a1dbe..f13f5df0c3747 100644
--- a/mingw-w64-libgd/PKGBUILD
+++ b/mingw-w64-libgd/PKGBUILD
@@ -53,7 +53,6 @@ prepare() {
 }
 
 build() {
-  [[ -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=" \
diff --git a/mingw-w64-libgdata/PKGBUILD b/mingw-w64-libgdata/PKGBUILD
index 467aabc5bbb98..2d2644802f7c0 100644
--- a/mingw-w64-libgdata/PKGBUILD
+++ b/mingw-w64-libgdata/PKGBUILD
@@ -42,9 +42,7 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir -p build-${MSYSTEM}
-  cd build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   ${MINGW_PREFIX}/bin/meson \
diff --git a/mingw-w64-libgdiplus/PKGBUILD b/mingw-w64-libgdiplus/PKGBUILD
index fd0b5020c8bec..0557e111553bf 100644
--- a/mingw-w64-libgdiplus/PKGBUILD
+++ b/mingw-w64-libgdiplus/PKGBUILD
@@ -48,9 +48,8 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}"/${_realname}-${pkgver}
-  [[ -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} \
diff --git a/mingw-w64-libgme/PKGBUILD b/mingw-w64-libgme/PKGBUILD
index 9428be522e11a..83482b6bf1f17 100644
--- a/mingw-w64-libgme/PKGBUILD
+++ b/mingw-w64-libgme/PKGBUILD
@@ -35,7 +35,6 @@ prepare() {
 
 build() {
   echo "Building static library"
-  [[ -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=" \
@@ -50,7 +49,6 @@ build() {
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
 
   echo "Building shared library"
-  [[ -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=" \
diff --git a/mingw-w64-libgnomecanvas/PKGBUILD b/mingw-w64-libgnomecanvas/PKGBUILD
index 2683b8339b762..211143b77c6e1 100644
--- a/mingw-w64-libgnomecanvas/PKGBUILD
+++ b/mingw-w64-libgnomecanvas/PKGBUILD
@@ -28,8 +28,8 @@ prepare() {
 }
 
 build() {
-  [[ -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} \
diff --git a/mingw-w64-libgoom2/PKGBUILD b/mingw-w64-libgoom2/PKGBUILD
index 6df6fe8fa113e..23b6022cd49ac 100644
--- a/mingw-w64-libgoom2/PKGBUILD
+++ b/mingw-w64-libgoom2/PKGBUILD
@@ -40,8 +40,8 @@ prepare() {
 }
 
 build() {
-  [[ -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} \
diff --git a/mingw-w64-libgsf/PKGBUILD b/mingw-w64-libgsf/PKGBUILD
index 60802167ca740..8034ae1cdaf61 100644
--- a/mingw-w64-libgsf/PKGBUILD
+++ b/mingw-w64-libgsf/PKGBUILD
@@ -38,7 +38,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   mkdir -p doc/html
diff --git a/mingw-w64-libgxps/PKGBUILD b/mingw-w64-libgxps/PKGBUILD
index bd61cfddc8caa..7d31d4a7d43aa 100644
--- a/mingw-w64-libgxps/PKGBUILD
+++ b/mingw-w64-libgxps/PKGBUILD
@@ -38,9 +38,7 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir -p build-${MSYSTEM}
-  cd build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   ${MINGW_PREFIX}/bin/meson \
diff --git a/mingw-w64-libharu/PKGBUILD b/mingw-w64-libharu/PKGBUILD
index 975d5b49aef27..2e6e52380ee0f 100644
--- a/mingw-w64-libharu/PKGBUILD
+++ b/mingw-w64-libharu/PKGBUILD
@@ -35,7 +35,6 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   declare -a extra_config
diff --git a/mingw-w64-libidl2/PKGBUILD b/mingw-w64-libidl2/PKGBUILD
index 45df345473b6e..b10424ce0ab40 100644
--- a/mingw-w64-libidl2/PKGBUILD
+++ b/mingw-w64-libidl2/PKGBUILD
@@ -25,9 +25,8 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}"/libIDL-${pkgver}
-  [[ -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} \
diff --git a/mingw-w64-libidn/PKGBUILD b/mingw-w64-libidn/PKGBUILD
index 67df5190164f9..4fea79b21b730 100644
--- a/mingw-w64-libidn/PKGBUILD
+++ b/mingw-w64-libidn/PKGBUILD
@@ -22,7 +22,6 @@ sha256sums=('d6c199dcd806e4fe279360cb4b08349a0d39560ed548ffd1ccadda8cdecb4723'
 validpgpkeys=('B1D2BD1375BECB784CF4F8C4D73CF638C53C06BE') # Simon Josefsson <simon@josefsson.org>
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-libidn2/PKGBUILD b/mingw-w64-libidn2/PKGBUILD
index 4c40b8ae8b816..71da0f8f27320 100644
--- a/mingw-w64-libidn2/PKGBUILD
+++ b/mingw-w64-libidn2/PKGBUILD
@@ -39,7 +39,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-shared-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-shared-${MSYSTEM}"
   mkdir -p "${srcdir}/build-shared-${MSYSTEM}" && cd "${srcdir}/build-shared-${MSYSTEM}"
   ../${_realname}-${_basever}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -54,7 +53,6 @@ build() {
   make
 
   export CPPFLAGS="$CPPFLAGS -DIN_LIBUNISTRING -DIDN2_STATIC"
-  [[ -d "${srcdir}/build-static-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-static-${MSYSTEM}"
   mkdir -p "${srcdir}/build-static-${MSYSTEM}" && cd "${srcdir}/build-static-${MSYSTEM}"
   ../${_realname}-${_basever}/configure \
     --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-libilbc/PKGBUILD b/mingw-w64-libilbc/PKGBUILD
index 7567dede4216d..0521623120e0a 100644
--- a/mingw-w64-libilbc/PKGBUILD
+++ b/mingw-w64-libilbc/PKGBUILD
@@ -26,7 +26,6 @@ build() {
     extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
-  [[ -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=" \
diff --git a/mingw-w64-libiptcdata/PKGBUILD b/mingw-w64-libiptcdata/PKGBUILD
index cfc0647b5db9e..1021092090cd1 100644
--- a/mingw-w64-libiptcdata/PKGBUILD
+++ b/mingw-w64-libiptcdata/PKGBUILD
@@ -26,7 +26,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-libmad/PKGBUILD b/mingw-w64-libmad/PKGBUILD
index 2813ea896be26..2fa7ea9d9d2be 100644
--- a/mingw-w64-libmad/PKGBUILD
+++ b/mingw-w64-libmad/PKGBUILD
@@ -52,9 +52,8 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir -p ${srcdir}/build-${MSYSTEM}
-  cd ${srcdir}/build-${MSYSTEM}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
+
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-libmatroska/PKGBUILD b/mingw-w64-libmatroska/PKGBUILD
index c166bd660f420..e1922d2d41442 100644
--- a/mingw-w64-libmatroska/PKGBUILD
+++ b/mingw-w64-libmatroska/PKGBUILD
@@ -35,7 +35,6 @@ build() {
     extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
-  [[ -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" \
@@ -48,7 +47,6 @@ build() {
 
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
 
-  [[ -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" \
diff --git a/mingw-w64-libmfx/PKGBUILD b/mingw-w64-libmfx/PKGBUILD
index 6faaa2da27ab0..c7dc425ae06e5 100644
--- a/mingw-w64-libmfx/PKGBUILD
+++ b/mingw-w64-libmfx/PKGBUILD
@@ -21,7 +21,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   export lt_cv_deplibs_check_method='pass_all'
diff --git a/mingw-w64-libmicrodns/PKGBUILD b/mingw-w64-libmicrodns/PKGBUILD
index df1a4c7379ddc..8824894e1da20 100644
--- a/mingw-w64-libmicrodns/PKGBUILD
+++ b/mingw-w64-libmicrodns/PKGBUILD
@@ -26,7 +26,6 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
diff --git a/mingw-w64-libmikmod/PKGBUILD b/mingw-w64-libmikmod/PKGBUILD
index 16ac62b38159c..110f566007720 100644
--- a/mingw-w64-libmikmod/PKGBUILD
+++ b/mingw-w64-libmikmod/PKGBUILD
@@ -25,10 +25,10 @@ source=(https://downloads.sourceforge.net/mikmod/${_realname}-${pkgver}.tar.gz)
 sha256sums=('adef6214863516a4a5b44ebf2c71ef84ecdfeb3444973dacbac70911c9bc67e9')
 
 build() {
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
   export lt_cv_deplibs_check_method='pass_all'
-  [[ -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} \
diff --git a/mingw-w64-libmimic/PKGBUILD b/mingw-w64-libmimic/PKGBUILD
index f73af5795c3af..8b2469f8a77cb 100644
--- a/mingw-w64-libmimic/PKGBUILD
+++ b/mingw-w64-libmimic/PKGBUILD
@@ -31,9 +31,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-libmng/PKGBUILD b/mingw-w64-libmng/PKGBUILD
index cffa9d7acedc9..3e67758fc833b 100644
--- a/mingw-w64-libmng/PKGBUILD
+++ b/mingw-w64-libmng/PKGBUILD
@@ -52,7 +52,6 @@ build() {
   fi
 
   # Separate build static and shared to get different pkg-config files
-  [[ -d ${srcdir}/shared-${MSYSTEM} ]] && rm -rf ${srcdir}/shared-${MSYSTEM}
   mkdir -p "${srcdir}/shared-${MSYSTEM}" && cd ${srcdir}/shared-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
@@ -67,7 +66,6 @@ build() {
 
   ${MINGW_PREFIX}/bin/cmake --build .
   
-  [[ -d ${srcdir}/static-${MSYSTEM} ]] && rm -rf ${srcdir}/static-${MSYSTEM}
   mkdir -p "${srcdir}/static-${MSYSTEM}" && cd ${srcdir}/static-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
diff --git a/mingw-w64-libmodbus-git/PKGBUILD b/mingw-w64-libmodbus-git/PKGBUILD
index 84e54fb5a9097..d13021dbe8b48 100644
--- a/mingw-w64-libmodbus-git/PKGBUILD
+++ b/mingw-w64-libmodbus-git/PKGBUILD
@@ -35,7 +35,6 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   ../${_realname}/configure \
diff --git a/mingw-w64-libmodplug/PKGBUILD b/mingw-w64-libmodplug/PKGBUILD
index 14c036640d164..7354487a01312 100644
--- a/mingw-w64-libmodplug/PKGBUILD
+++ b/mingw-w64-libmodplug/PKGBUILD
@@ -30,9 +30,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-libmpcdec/PKGBUILD b/mingw-w64-libmpcdec/PKGBUILD
index 271225abeef1a..526fed640f615 100644
--- a/mingw-w64-libmpcdec/PKGBUILD
+++ b/mingw-w64-libmpcdec/PKGBUILD
@@ -49,7 +49,6 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../musepack_src_r${_rel}/configure \
diff --git a/mingw-w64-libmpeg2-git/PKGBUILD b/mingw-w64-libmpeg2-git/PKGBUILD
index 8fb0e854b3b0e..8040c2ed7c216 100644
--- a/mingw-w64-libmpeg2-git/PKGBUILD
+++ b/mingw-w64-libmpeg2-git/PKGBUILD
@@ -40,8 +40,8 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir build-${MSYSTEM} && cd build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
+
   ../${_realname}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-libmysofa/PKGBUILD b/mingw-w64-libmysofa/PKGBUILD
index 67b33de0a34a8..3c0040d3d0f74 100644
--- a/mingw-w64-libmysofa/PKGBUILD
+++ b/mingw-w64-libmysofa/PKGBUILD
@@ -40,7 +40,6 @@ prepare() {
 }
 
 build() {
-  [[ -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=" \
diff --git a/mingw-w64-libnotify/PKGBUILD b/mingw-w64-libnotify/PKGBUILD
index 59677a24d04e2..83e6fa2e2b2cc 100644
--- a/mingw-w64-libnotify/PKGBUILD
+++ b/mingw-w64-libnotify/PKGBUILD
@@ -38,7 +38,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
diff --git a/mingw-w64-libnova/PKGBUILD b/mingw-w64-libnova/PKGBUILD
index 5ec7283950e0b..bdc98b73e3ff0 100644
--- a/mingw-w64-libnova/PKGBUILD
+++ b/mingw-w64-libnova/PKGBUILD
@@ -23,9 +23,8 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  [[ -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} \
diff --git a/mingw-w64-libnumbertext/PKGBUILD b/mingw-w64-libnumbertext/PKGBUILD
index 93f3ae4ae722e..56d6ea934d549 100644
--- a/mingw-w64-libnumbertext/PKGBUILD
+++ b/mingw-w64-libnumbertext/PKGBUILD
@@ -24,8 +24,8 @@ prepare() {
 }
 
 build() {
-  [[ -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} \
diff --git a/mingw-w64-libogg/PKGBUILD b/mingw-w64-libogg/PKGBUILD
index 9f36728a0c067..5706f541e1eb6 100644
--- a/mingw-w64-libogg/PKGBUILD
+++ b/mingw-w64-libogg/PKGBUILD
@@ -31,7 +31,6 @@ build() {
   fi
 
   # 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=" \
@@ -46,7 +45,6 @@ build() {
   make
 
   # 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=" \
diff --git a/mingw-w64-libopenmpt-modplug/PKGBUILD b/mingw-w64-libopenmpt-modplug/PKGBUILD
index bc0b26ad9d69c..a1c4c3c633701 100644
--- a/mingw-w64-libopenmpt-modplug/PKGBUILD
+++ b/mingw-w64-libopenmpt-modplug/PKGBUILD
@@ -25,8 +25,8 @@ prepare() {
 }
 
 build() {
-  [[ -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} \
diff --git a/mingw-w64-libopusenc/PKGBUILD b/mingw-w64-libopusenc/PKGBUILD
index 149a8668cb17b..566498d5703bf 100644
--- a/mingw-w64-libopusenc/PKGBUILD
+++ b/mingw-w64-libopusenc/PKGBUILD
@@ -17,9 +17,7 @@ source=(https://downloads.xiph.org/releases/opus/${_realname}-${pkgver}.tar.gz)
 sha256sums=('8298db61a8d3d63e41c1a80705baa8ce9ff3f50452ea7ec1c19a564fe106cbb9')
 
 build() {
-  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-libotr/PKGBUILD b/mingw-w64-libotr/PKGBUILD
index 716b3b3378a05..f7aa9e90686d0 100644
--- a/mingw-w64-libotr/PKGBUILD
+++ b/mingw-w64-libotr/PKGBUILD
@@ -33,7 +33,6 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-libplacebo/PKGBUILD b/mingw-w64-libplacebo/PKGBUILD
index e27a4e91edca3..d0ad97a9fbbfb 100644
--- a/mingw-w64-libplacebo/PKGBUILD
+++ b/mingw-w64-libplacebo/PKGBUILD
@@ -30,7 +30,6 @@ sha256sums=('79120e685a1836344b51b13b6a5661622486a84e4d4a35f6c8d01679a20fbc86'
             'bda9bed8b8fff7e69fe750b6f2caafde67f63343d05698a81fb1f7b27ac4cca3')
 
 build() {
-  [[ -d "${srcdir}"/build-shared-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-shared-${MSYSTEM}
   mkdir -p "${srcdir}"/build-shared-${MSYSTEM} && cd "${srcdir}"/build-shared-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
@@ -48,7 +47,6 @@ build() {
 
   meson compile
 
-  [[ -d "${srcdir}"/build-static-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-static-${MSYSTEM}
   mkdir -p "${srcdir}"/build-static-${MSYSTEM} && cd "${srcdir}"/build-static-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
diff --git a/mingw-w64-libpng/PKGBUILD b/mingw-w64-libpng/PKGBUILD
index 73fb509b0a274..9fad0ff7b0678 100644
--- a/mingw-w64-libpng/PKGBUILD
+++ b/mingw-w64-libpng/PKGBUILD
@@ -39,7 +39,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../"${_realname}-${pkgver}"/configure \
diff --git a/mingw-w64-libraw/PKGBUILD b/mingw-w64-libraw/PKGBUILD
index 52a382602d29b..695f849d2388e 100644
--- a/mingw-w64-libraw/PKGBUILD
+++ b/mingw-w64-libraw/PKGBUILD
@@ -47,7 +47,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then
diff --git a/mingw-w64-libreplaygain/PKGBUILD b/mingw-w64-libreplaygain/PKGBUILD
index 03400562e7787..80da78907dc45 100644
--- a/mingw-w64-libreplaygain/PKGBUILD
+++ b/mingw-w64-libreplaygain/PKGBUILD
@@ -23,7 +23,6 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}_r${pkgver}/configure \
diff --git a/mingw-w64-libressl/PKGBUILD b/mingw-w64-libressl/PKGBUILD
index bbdd5744756d4..5c459c79eb5af 100644
--- a/mingw-w64-libressl/PKGBUILD
+++ b/mingw-w64-libressl/PKGBUILD
@@ -36,7 +36,6 @@ prepare() {
 
 build() {
   msg "Building static lib..."
-  [[ -d "${srcdir}"/build-${MSYSTEM}-static ]] && rm -rf "${srcdir}"/build-${MSYSTEM}-static
   mkdir -p "${srcdir}"/build-${MSYSTEM}-static
   (cd "${srcdir}"/build-${MSYSTEM}-static
   ../${_realname}-${pkgver}/configure \
@@ -52,7 +51,6 @@ build() {
   )
 
   msg "Building shared library..."
-  [[ -d "${srcdir}"/build-${MSYSTEM}-shared ]] && rm -rf "${srcdir}"/build-${MSYSTEM}-shared
   mkdir -p "${srcdir}"/build-${MSYSTEM}-shared
   (cd "${srcdir}"/build-${MSYSTEM}-shared
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-librest/PKGBUILD b/mingw-w64-librest/PKGBUILD
index da090213966dc..e6af7e22d1fe3 100644
--- a/mingw-w64-librest/PKGBUILD
+++ b/mingw-w64-librest/PKGBUILD
@@ -32,7 +32,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
diff --git a/mingw-w64-librsync/PKGBUILD b/mingw-w64-librsync/PKGBUILD
index 08a9c3fe9726b..26390e0770f99 100644
--- a/mingw-w64-librsync/PKGBUILD
+++ b/mingw-w64-librsync/PKGBUILD
@@ -30,7 +30,6 @@ build() {
   fi
 
   # 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 \
@@ -43,7 +42,6 @@ build() {
   make
 
   # 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=" \
diff --git a/mingw-w64-libsass/PKGBUILD b/mingw-w64-libsass/PKGBUILD
index e1d1c17c49443..e03f5f5697cc1 100644
--- a/mingw-w64-libsass/PKGBUILD
+++ b/mingw-w64-libsass/PKGBUILD
@@ -26,7 +26,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-libsbsms/PKGBUILD b/mingw-w64-libsbsms/PKGBUILD
index cf51bc452ec40..8e4e226601e30 100644
--- a/mingw-w64-libsbsms/PKGBUILD
+++ b/mingw-w64-libsbsms/PKGBUILD
@@ -19,9 +19,7 @@ source=("$_realname-$pkgver.tar.gz::https://github.com/claytonotey/libsbsms/arch
 sha256sums=('4f88d152bc06fedbda9d5d65517d40254a7310c9050601a93122309d45afd2c9')
 
 build() {
-  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   declare -a extra_config
   if check_option "debug" "n"; then
diff --git a/mingw-w64-libsecret/PKGBUILD b/mingw-w64-libsecret/PKGBUILD
index 9c47698ec30a4..92063d2d1fb75 100644
--- a/mingw-w64-libsecret/PKGBUILD
+++ b/mingw-w64-libsecret/PKGBUILD
@@ -38,7 +38,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   # clang error from vala generated file
diff --git a/mingw-w64-libshout/PKGBUILD b/mingw-w64-libshout/PKGBUILD
index e75b557b44618..e851ab6ec0d81 100644
--- a/mingw-w64-libshout/PKGBUILD
+++ b/mingw-w64-libshout/PKGBUILD
@@ -54,7 +54,6 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-libsignal-protocol-c/PKGBUILD b/mingw-w64-libsignal-protocol-c/PKGBUILD
index e2d85ce47af10..9f00075f068bb 100644
--- a/mingw-w64-libsignal-protocol-c/PKGBUILD
+++ b/mingw-w64-libsignal-protocol-c/PKGBUILD
@@ -28,7 +28,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   declare -a _extra_config
diff --git a/mingw-w64-libsigsegv/PKGBUILD b/mingw-w64-libsigsegv/PKGBUILD
index 8a1b445938e3d..3398b9fd73010 100644
--- a/mingw-w64-libsigsegv/PKGBUILD
+++ b/mingw-w64-libsigsegv/PKGBUILD
@@ -23,9 +23,8 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}"/${_realname}-${pkgver}
-  [[ -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} \
diff --git a/mingw-w64-libsoup/PKGBUILD b/mingw-w64-libsoup/PKGBUILD
index c2b9fef71ca65..268acc0e37037 100644
--- a/mingw-w64-libsoup/PKGBUILD
+++ b/mingw-w64-libsoup/PKGBUILD
@@ -36,7 +36,6 @@ prepare() {
 }
 
 build() {
-  [[ -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
diff --git a/mingw-w64-libsoxr/PKGBUILD b/mingw-w64-libsoxr/PKGBUILD
index 5a15518bab636..0450e244c5f9f 100644
--- a/mingw-w64-libsoxr/PKGBUILD
+++ b/mingw-w64-libsoxr/PKGBUILD
@@ -34,7 +34,6 @@ prepare() {
 
 build() {
   # Build 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=" \
@@ -56,7 +55,6 @@ build() {
   ${MINGW_PREFIX}/bin/cmake --build .
 
   # Build 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=" \
diff --git a/mingw-w64-libsquish/PKGBUILD b/mingw-w64-libsquish/PKGBUILD
index cb6b53cf198ce..249d01b671f84 100644
--- a/mingw-w64-libsquish/PKGBUILD
+++ b/mingw-w64-libsquish/PKGBUILD
@@ -31,7 +31,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM}-shared ]] && rm -rf "${srcdir}"/build-${MSYSTEM}-shared
   mkdir -p "${srcdir}"/build-${MSYSTEM}-shared && cd "${srcdir}"/build-${MSYSTEM}-shared
 
   # Build shared version
@@ -44,7 +43,6 @@ build() {
     ../${_realname}-${pkgver}
   ${MINGW_PREFIX}/bin/cmake --build .
 
-  [[ -d "${srcdir}"/build-${MSYSTEM}-static ]] && rm -rf "${srcdir}"/build-${MSYSTEM}-static
   mkdir -p "${srcdir}"/build-${MSYSTEM}-static && cd "${srcdir}"/build-${MSYSTEM}-static
   # Build static version
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX" \
diff --git a/mingw-w64-libsystre/PKGBUILD b/mingw-w64-libsystre/PKGBUILD
index a368542742426..e341305d03753 100644
--- a/mingw-w64-libsystre/PKGBUILD
+++ b/mingw-w64-libsystre/PKGBUILD
@@ -25,8 +25,8 @@ prepare() {
 }
 
 build() {
-  [[ -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} \
diff --git a/mingw-w64-libtasn1/PKGBUILD b/mingw-w64-libtasn1/PKGBUILD
index 5d8d500d0454b..e1687835be70e 100644
--- a/mingw-w64-libtasn1/PKGBUILD
+++ b/mingw-w64-libtasn1/PKGBUILD
@@ -31,8 +31,8 @@ prepare() {
 }
 
 build() {
-  [[ -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} \
diff --git a/mingw-w64-libthai/PKGBUILD b/mingw-w64-libthai/PKGBUILD
index 76ffefec33e54..b8a4af0f57d5c 100644
--- a/mingw-w64-libthai/PKGBUILD
+++ b/mingw-w64-libthai/PKGBUILD
@@ -31,8 +31,8 @@ prepare() {
 }
 
 build() {
-  [[ -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} \
diff --git a/mingw-w64-libtheora/PKGBUILD b/mingw-w64-libtheora/PKGBUILD
index 10aeb5d46bb46..d8607d31955fd 100644
--- a/mingw-w64-libtheora/PKGBUILD
+++ b/mingw-w64-libtheora/PKGBUILD
@@ -35,9 +35,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  mkdir -p ${srcdir}/build-$MINGW_CHOST
-  cd "${srcdir}/build-$MINGW_CHOST"
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
     --build=${MINGW_CHOST} \
@@ -50,6 +48,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-$MINGW_CHOST"
+  cd "${srcdir}/build-${MSYSTEM}"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/mingw-w64-libtimidity/PKGBUILD b/mingw-w64-libtimidity/PKGBUILD
index f63991e6f1282..acfc22465306f 100644
--- a/mingw-w64-libtimidity/PKGBUILD
+++ b/mingw-w64-libtimidity/PKGBUILD
@@ -22,10 +22,10 @@ _timidity_cfg=timidity.cfg
 
 # libao is only needed for make check, therefore disable it surely.
 build() {
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
   export lt_cv_deplibs_check_method='pass_all'
-  [[ -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} \
diff --git a/mingw-w64-libtre/PKGBUILD b/mingw-w64-libtre/PKGBUILD
index dadb758c6db4f..a3d42dc1b0896 100644
--- a/mingw-w64-libtre/PKGBUILD
+++ b/mingw-w64-libtre/PKGBUILD
@@ -33,9 +33,8 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir -p build-${MSYSTEM}
-  cd build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
+
   ../${_realname}/configure \
     --prefix=${MINGW_PREFIX} \
     --host=${MINGW_CHOST} \
diff --git a/mingw-w64-libunistring/PKGBUILD b/mingw-w64-libunistring/PKGBUILD
index b74cc1ce08967..980cd69e706e7 100644
--- a/mingw-w64-libunistring/PKGBUILD
+++ b/mingw-w64-libunistring/PKGBUILD
@@ -29,8 +29,8 @@ prepare() {
 
 build() {
   #export lt_cv_deplibs_check_method='pass_all'
-  [[ -d "${srcdir}/build-static-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-static-${MSYSTEM}"
   mkdir -p "${srcdir}/build-static-${MSYSTEM}" && cd "${srcdir}/build-static-${MSYSTEM}"
+
   ../libunistring-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -40,7 +40,6 @@ build() {
 
   make
 
-  [[ -d "${srcdir}/build-shared-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-shared-${MSYSTEM}"
   mkdir -p "${srcdir}/build-shared-${MSYSTEM}" && cd "${srcdir}/build-shared-${MSYSTEM}"
   ../libunistring-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-libuv/PKGBUILD b/mingw-w64-libuv/PKGBUILD
index 841540b543f95..d00e652afecb6 100644
--- a/mingw-w64-libuv/PKGBUILD
+++ b/mingw-w64-libuv/PKGBUILD
@@ -32,7 +32,6 @@ validpgpkeys=(
 )
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   declare -a _extra_config
diff --git a/mingw-w64-libvorbis/PKGBUILD b/mingw-w64-libvorbis/PKGBUILD
index 9265fe8965b8b..2e8cfebb21caf 100644
--- a/mingw-w64-libvorbis/PKGBUILD
+++ b/mingw-w64-libvorbis/PKGBUILD
@@ -21,9 +21,8 @@ source=(https://downloads.xiph.org/releases/vorbis/${_realname}-${pkgver}.tar.gz
 sha256sums=('0e982409a9c3fc82ee06e08205b1355e5c6aa4c36bca58146ef399621b0ce5ab')
 
 build() {
-  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-libvpx/PKGBUILD b/mingw-w64-libvpx/PKGBUILD
index e5bf0d0e3affd..91cfb4d05bf5e 100644
--- a/mingw-w64-libvpx/PKGBUILD
+++ b/mingw-w64-libvpx/PKGBUILD
@@ -50,7 +50,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   case "${MINGW_CHOST}" in
diff --git a/mingw-w64-libxml++/PKGBUILD b/mingw-w64-libxml++/PKGBUILD
index afa7619c62ddc..e912efe289726 100644
--- a/mingw-w64-libxml++/PKGBUILD
+++ b/mingw-w64-libxml++/PKGBUILD
@@ -30,9 +30,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   meson \
diff --git a/mingw-w64-libxml++2.6/PKGBUILD b/mingw-w64-libxml++2.6/PKGBUILD
index 179ddbef4131d..931f230aae948 100644
--- a/mingw-w64-libxml++2.6/PKGBUILD
+++ b/mingw-w64-libxml++2.6/PKGBUILD
@@ -29,9 +29,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   meson \
diff --git a/mingw-w64-libxml2/PKGBUILD b/mingw-w64-libxml2/PKGBUILD
index 2d1c18140001c..5f7cf632bc598 100644
--- a/mingw-w64-libxml2/PKGBUILD
+++ b/mingw-w64-libxml2/PKGBUILD
@@ -70,7 +70,6 @@ prepare() {
 build() {
   # Static build
   msg2 "Building static for ${MSYSTEM}"
-  [[ -d "${srcdir}"/build-static-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-static-${MSYSTEM}
   mkdir -p ${srcdir}/build-static-${MSYSTEM} && cd ${srcdir}/build-static-${MSYSTEM}
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -87,7 +86,6 @@ build() {
 
   # Shared build
   msg2 "Building shared with Python ext ${MSYSTEM}"
-  [[ -d "${srcdir}"/build-shared-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-shared-${MSYSTEM}
   mkdir -p ${srcdir}/build-shared-${MSYSTEM} && cd ${srcdir}/build-shared-${MSYSTEM}
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-libyuv/PKGBUILD b/mingw-w64-libyuv/PKGBUILD
index 28efe28866623..667daad7f4e58 100644
--- a/mingw-w64-libyuv/PKGBUILD
+++ b/mingw-w64-libyuv/PKGBUILD
@@ -42,7 +42,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   declare -a extra_config
diff --git a/mingw-w64-live-chart/PKGBUILD b/mingw-w64-live-chart/PKGBUILD
index 8a957a459b94f..e8217de563e5d 100644
--- a/mingw-w64-live-chart/PKGBUILD
+++ b/mingw-w64-live-chart/PKGBUILD
@@ -27,8 +27,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
-  mkdir "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   ${MINGW_PREFIX}/bin/meson setup \
diff --git a/mingw-w64-lpsolve/PKGBUILD b/mingw-w64-lpsolve/PKGBUILD
index 06b1d4d73bdd8..052fe8a1b8b55 100644
--- a/mingw-w64-lpsolve/PKGBUILD
+++ b/mingw-w64-lpsolve/PKGBUILD
@@ -36,7 +36,6 @@ build() {
   fi
 
   # shared build
-  [[ -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 \
@@ -48,7 +47,6 @@ build() {
   make
 
   # static build
-  [[ -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 \
diff --git a/mingw-w64-lzo2/PKGBUILD b/mingw-w64-lzo2/PKGBUILD
index 7dcda78214a44..c5735720e2b62 100644
--- a/mingw-w64-lzo2/PKGBUILD
+++ b/mingw-w64-lzo2/PKGBUILD
@@ -25,8 +25,8 @@ prepare() {
 }
 
 build() {
-  [[ -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} \
@@ -34,6 +34,7 @@ build() {
     --target=${MINGW_CHOST} \
     --enable-static \
     --enable-shared
+
   make
 }
 
diff --git a/mingw-w64-magnum-plugins/PKGBUILD b/mingw-w64-magnum-plugins/PKGBUILD
index cd96aa803af7a..1bb0f62a07cd8 100644
--- a/mingw-w64-magnum-plugins/PKGBUILD
+++ b/mingw-w64-magnum-plugins/PKGBUILD
@@ -43,7 +43,6 @@ prepare() {
 }
 
 build() {
-    [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
     mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
     # Bundle Basis Universal
diff --git a/mingw-w64-mcfgthread/PKGBUILD b/mingw-w64-mcfgthread/PKGBUILD
index e8a51e1adab7d..9f904e313f1d3 100644
--- a/mingw-w64-mcfgthread/PKGBUILD
+++ b/mingw-w64-mcfgthread/PKGBUILD
@@ -23,12 +23,16 @@ source=("git+https://github.com/lhmouse/mcfgthread.git#tag=v${pkgver%.*}-ga.${pk
 sha256sums=('aa83745c5fcea6b2615da0f20b405291a3e0c72c521b238350b075a4f1e8be21')
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
-  MSYS2_ARG_CONV_EXCL="--prefix=" meson setup -Dbuildtype=plain  \
-    -Dc_args='-Os -g' -Dc_link_args='-Os'  \
-    --prefix="${MINGW_PREFIX}" . ../${_realname}
+  MSYS2_ARG_CONV_EXCL="--prefix=" \
+    meson setup \
+    --prefix="${MINGW_PREFIX}" \
+    -Dbuildtype=plain  \
+    -Dc_args='-Os -g' \
+    -Dc_link_args='-Os'  \
+    . \
+    ../${_realname}
 
   # Build the DLL first, as Meson creates the DLL in the working directory,
   # which might get picked up by cc1.exe when it is only half-baked.
diff --git a/mingw-w64-mcpp/PKGBUILD b/mingw-w64-mcpp/PKGBUILD
index a26d7481f1620..4474271b73bb9 100644
--- a/mingw-w64-mcpp/PKGBUILD
+++ b/mingw-w64-mcpp/PKGBUILD
@@ -19,9 +19,8 @@ source=("https://downloads.sourceforge.net/mcpp/${_realname}-${pkgver}.tar.gz")
 sha256sums=('3b9b4421888519876c4fc68ade324a3bbd81ceeb7092ecdbbc2055099fcb8864')
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-md4c/PKGBUILD b/mingw-w64-md4c/PKGBUILD
index 65c59849e5bcd..c79d7599919ef 100644
--- a/mingw-w64-md4c/PKGBUILD
+++ b/mingw-w64-md4c/PKGBUILD
@@ -34,7 +34,6 @@ build() {
   fi
 
   dir_shared="${srcdir}/build-${MSYSTEM}-shared"
-  [[ -d "${dir_shared}" ]] && rm -rf "${dir_shared}"
   mkdir -p "${dir_shared}" && cd "${dir_shared}"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
@@ -48,7 +47,6 @@ build() {
   ninja
 
   dir_static="${srcdir}/build-${MSYSTEM}-static"
-  [[ -d "${dir_static}" ]] && rm -rf "${dir_static}"
   mkdir -p "${dir_static}" && cd "${dir_static}"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
diff --git a/mingw-w64-meanwhile/PKGBUILD b/mingw-w64-meanwhile/PKGBUILD
index 34db69fb46eb1..241e72848fc72 100644
--- a/mingw-w64-meanwhile/PKGBUILD
+++ b/mingw-w64-meanwhile/PKGBUILD
@@ -34,7 +34,6 @@ prepare() {
 
 }
 build() {
-  [[ -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"
diff --git a/mingw-w64-metis/PKGBUILD b/mingw-w64-metis/PKGBUILD
index 5e4ec628fea13..6d2f55a6039a6 100644
--- a/mingw-w64-metis/PKGBUILD
+++ b/mingw-w64-metis/PKGBUILD
@@ -34,16 +34,15 @@ prepare() {
 }
 
 build() {
+  declare -a extra_config
+  if check_option "debug" "n"; then
+    extra_config+=("-DCMAKE_BUILD_TYPE=Release")
+  else
+    extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
+  fi
+
   for _shared in OFF ON; do
-    cd "$srcdir"/${_realname}-${pkgver}
-    [[ -d "${srcdir}"/build-shared-${_shared}-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-shared-${_shared}-${MSYSTEM}
     mkdir -p "${srcdir}"/build-shared-${_shared}-${MSYSTEM} && cd "${srcdir}"/build-shared-${_shared}-${MSYSTEM}
-    declare -a extra_config
-    if check_option "debug" "n"; then
-      extra_config+=("-DCMAKE_BUILD_TYPE=Release")
-    else
-      extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
-    fi
     MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX="  \
       ${MINGW_PREFIX}/bin/cmake                    \
         -G'Ninja'                                  \
diff --git a/mingw-w64-mpc/PKGBUILD b/mingw-w64-mpc/PKGBUILD
index ec509a430b822..6db5457ddbaa5 100644
--- a/mingw-w64-mpc/PKGBUILD
+++ b/mingw-w64-mpc/PKGBUILD
@@ -25,8 +25,8 @@ sha256sums=('ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8'
 validpgpkeys=('AD17A21EF8AED8F1CC02DBD9F7D5C9BF765C61E3')
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
+
   ../${_realname}-${pkgver}/configure \
      --build=${MINGW_CHOST} \
     --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-mpfr/PKGBUILD b/mingw-w64-mpfr/PKGBUILD
index 32bc7a860d64a..fba28eeaa6079 100644
--- a/mingw-w64-mpfr/PKGBUILD
+++ b/mingw-w64-mpfr/PKGBUILD
@@ -33,7 +33,6 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   ../${_realname}-${_pkgver}/configure \
diff --git a/mingw-w64-msitools/PKGBUILD b/mingw-w64-msitools/PKGBUILD
index 346e0672f7405..f2747bec330e8 100644
--- a/mingw-w64-msitools/PKGBUILD
+++ b/mingw-w64-msitools/PKGBUILD
@@ -40,7 +40,6 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   # clang error from vala generated file
diff --git a/mingw-w64-msmpi/PKGBUILD b/mingw-w64-msmpi/PKGBUILD
index 84fa1cca4b86e..b3e419186e9d3 100644
--- a/mingw-w64-msmpi/PKGBUILD
+++ b/mingw-w64-msmpi/PKGBUILD
@@ -48,7 +48,6 @@ sha256sums=('17086fb1cf949251e4ae1549a06d292c58e468c822cca3ac1851e57e79d8ab20'
             '773d406e05340b3b96326ddd04f43fea3df3ca30912412824a976a18a86fc007')
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   # Import library (.dll.a)
diff --git a/mingw-w64-mypaint-brushes/PKGBUILD b/mingw-w64-mypaint-brushes/PKGBUILD
index 46650d4577c8c..5c2307d27e1cd 100644
--- a/mingw-w64-mypaint-brushes/PKGBUILD
+++ b/mingw-w64-mypaint-brushes/PKGBUILD
@@ -29,7 +29,6 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   "${srcdir}/${_realname}-${pkgver}"/configure \
diff --git a/mingw-w64-mypaint-brushes2/PKGBUILD b/mingw-w64-mypaint-brushes2/PKGBUILD
index 0550e4e64736a..78bfea8774398 100644
--- a/mingw-w64-mypaint-brushes2/PKGBUILD
+++ b/mingw-w64-mypaint-brushes2/PKGBUILD
@@ -28,7 +28,6 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   "${srcdir}/${_realname}-${pkgver}"/configure \
diff --git a/mingw-w64-nana/PKGBUILD b/mingw-w64-nana/PKGBUILD
index 87426aa870cb2..9f266a037e998 100644
--- a/mingw-w64-nana/PKGBUILD
+++ b/mingw-w64-nana/PKGBUILD
@@ -26,8 +26,6 @@ prepare() {
 }
 
 build() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  [[ -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=" \
diff --git a/mingw-w64-nanodbc/PKGBUILD b/mingw-w64-nanodbc/PKGBUILD
index d5bc14935336b..3ca8d72429b52 100644
--- a/mingw-w64-nanodbc/PKGBUILD
+++ b/mingw-w64-nanodbc/PKGBUILD
@@ -26,7 +26,6 @@ prepare() {
 }
 
 build() {
-  [[ -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=" \
diff --git a/mingw-w64-newton-dynamics/PKGBUILD b/mingw-w64-newton-dynamics/PKGBUILD
index 8d48fff249cf5..f92a224d244a3 100644
--- a/mingw-w64-newton-dynamics/PKGBUILD
+++ b/mingw-w64-newton-dynamics/PKGBUILD
@@ -33,7 +33,6 @@ prepare() {
 
 build() {
   #Static Build
-  [[ -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=" \
@@ -51,7 +50,6 @@ build() {
     ${MINGW_PREFIX}/bin/cmake --build .
 
   #Shared Build
-  [[ -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=" \
diff --git a/mingw-w64-nlohmann-json/PKGBUILD b/mingw-w64-nlohmann-json/PKGBUILD
index 05d0d234cbceb..915943afea50d 100644
--- a/mingw-w64-nlohmann-json/PKGBUILD
+++ b/mingw-w64-nlohmann-json/PKGBUILD
@@ -29,7 +29,6 @@ prepare() {
 }
 
 build() {
-  [[ -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=" \
diff --git a/mingw-w64-ode/PKGBUILD b/mingw-w64-ode/PKGBUILD
index 33200d7aaa577..9e4f5218257a6 100644
--- a/mingw-w64-ode/PKGBUILD
+++ b/mingw-w64-ode/PKGBUILD
@@ -28,8 +28,6 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}"/${_realname}-${pkgver}
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   declare -a extra_config
diff --git a/mingw-w64-ois/PKGBUILD b/mingw-w64-ois/PKGBUILD
index b043d6a85c0b7..bd9060fd35939 100644
--- a/mingw-w64-ois/PKGBUILD
+++ b/mingw-w64-ois/PKGBUILD
@@ -29,7 +29,6 @@ prepare() {
 
 build() {
   msg "Build shared version..."
-  [[ -d ${srcdir}/build-shared-${MSYSTEM} ]] && rm -rf ${srcdir}/build-shared-${MSYSTEM}
   mkdir -p ${srcdir}/build-shared-${MSYSTEM} && cd ${srcdir}/build-shared-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
@@ -43,7 +42,6 @@ build() {
   "${MINGW_PREFIX}"/bin/cmake.exe --build .
 
   msg "Build static version..."
-  [[ -d ${srcdir}/build-static-${MSYSTEM} ]] && rm -rf ${srcdir}/build-static-${MSYSTEM}
   mkdir -p ${srcdir}/build-static-${MSYSTEM} && cd ${srcdir}/build-static-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
diff --git a/mingw-w64-onigmo/PKGBUILD b/mingw-w64-onigmo/PKGBUILD
index a423f258b0fcc..a079c23c41e5d 100644
--- a/mingw-w64-onigmo/PKGBUILD
+++ b/mingw-w64-onigmo/PKGBUILD
@@ -23,9 +23,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
       --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-oniguruma/PKGBUILD b/mingw-w64-oniguruma/PKGBUILD
index 9cf3fa6175285..dc5a4862ade3f 100644
--- a/mingw-w64-oniguruma/PKGBUILD
+++ b/mingw-w64-oniguruma/PKGBUILD
@@ -28,7 +28,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver%.1}/configure \
diff --git a/mingw-w64-opencore-amr/PKGBUILD b/mingw-w64-opencore-amr/PKGBUILD
index 997c21ac95fc9..62eab3b946411 100644
--- a/mingw-w64-opencore-amr/PKGBUILD
+++ b/mingw-w64-opencore-amr/PKGBUILD
@@ -20,9 +20,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -30,6 +29,7 @@ build() {
     --target=${MINGW_CHOST} \
     --enable-shared \
     --enable-static
+
   make
 }
 
diff --git a/mingw-w64-openimagedenoise/PKGBUILD b/mingw-w64-openimagedenoise/PKGBUILD
index e7dbdf763fc1a..263b16e1b456c 100644
--- a/mingw-w64-openimagedenoise/PKGBUILD
+++ b/mingw-w64-openimagedenoise/PKGBUILD
@@ -39,7 +39,6 @@ build() {
     extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
-  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
diff --git a/mingw-w64-openjpeg2/PKGBUILD b/mingw-w64-openjpeg2/PKGBUILD
index 23ca4cc10ddb2..653229562a782 100644
--- a/mingw-w64-openjpeg2/PKGBUILD
+++ b/mingw-w64-openjpeg2/PKGBUILD
@@ -66,9 +66,7 @@ build() {
   fi
 
   msg "Build static version"
-  [[ -d ${srcdir}/build-static-${MSYSTEM} ]] && rm -rf ${srcdir}/build-static-${MSYSTEM}
-  mkdir ${srcdir}/build-static-${MSYSTEM}
-  cd ${srcdir}/build-static-${MSYSTEM}
+  mkdir -p ${srcdir}/build-static-${MSYSTEM} && cd ${srcdir}/build-static-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
@@ -86,9 +84,7 @@ build() {
   ${MINGW_PREFIX}/bin/cmake --build ./
 
   msg "Build shared version"
-  [[ -d ${srcdir}/build-shared-${MSYSTEM} ]] && rm -rf ${srcdir}/build-shared-${MSYSTEM}
-  mkdir ${srcdir}/build-shared-${MSYSTEM}
-  cd ${srcdir}/build-shared-${MSYSTEM}
+  mkdir -p ${srcdir}/build-shared-${MSYSTEM} && cd ${srcdir}/build-shared-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
diff --git a/mingw-w64-openvr/PKGBUILD b/mingw-w64-openvr/PKGBUILD
index fa540e23d2b8e..4d0a4e4083c26 100644
--- a/mingw-w64-openvr/PKGBUILD
+++ b/mingw-w64-openvr/PKGBUILD
@@ -55,8 +55,7 @@ build() {
     extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
-  [[ -d ${srcdir}/build-${MSYSTEM}-shared ]] && rm -r ${srcdir}/build-${MSYSTEM}-shared
-  mkdir ${srcdir}/build-${MSYSTEM}-shared && cd ${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 \
@@ -68,8 +67,7 @@ build() {
 
   ${MINGW_PREFIX}/bin/cmake --build . #VERBOSE=1
 
-  [[ -d ${srcdir}/build-${MSYSTEM}-static ]] && rm -r ${srcdir}/build-${MSYSTEM}-static
-  mkdir ${srcdir}/build-${MSYSTEM}-static && cd ${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 \
diff --git a/mingw-w64-opus-tools/PKGBUILD b/mingw-w64-opus-tools/PKGBUILD
index a6aee66b3216a..74fe38ed1156d 100644
--- a/mingw-w64-opus-tools/PKGBUILD
+++ b/mingw-w64-opus-tools/PKGBUILD
@@ -22,9 +22,7 @@ source=(https://downloads.xiph.org/releases/opus/${_realname}-${pkgver}.tar.gz)
 sha256sums=('b4e56cb00d3e509acfba9a9b627ffd8273b876b4e2408642259f6da28fa0ff86')
 
 build() {
-  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-orc/PKGBUILD b/mingw-w64-orc/PKGBUILD
index 6ed79a2b80595..fec6e91455170 100644
--- a/mingw-w64-orc/PKGBUILD
+++ b/mingw-w64-orc/PKGBUILD
@@ -23,9 +23,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   ${MINGW_PREFIX}/bin/meson setup \
diff --git a/mingw-w64-p11-kit/PKGBUILD b/mingw-w64-p11-kit/PKGBUILD
index aa5c4b22e6853..44a60d48cece7 100644
--- a/mingw-w64-p11-kit/PKGBUILD
+++ b/mingw-w64-p11-kit/PKGBUILD
@@ -79,7 +79,6 @@ prepare() {
 }
 
 build() {
-  [[ -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" \
diff --git a/mingw-w64-pango/PKGBUILD b/mingw-w64-pango/PKGBUILD
index 8cba9a2ef3842..6c56f3af4c242 100644
--- a/mingw-w64-pango/PKGBUILD
+++ b/mingw-w64-pango/PKGBUILD
@@ -52,9 +52,7 @@ build() {
     -DCAIRO_WIN32_STATIC_BUILD
   )
 
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir -p build-${MSYSTEM}
-  cd build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   ${MINGW_PREFIX}/bin/meson setup \
@@ -71,9 +69,7 @@ build() {
   ${MINGW_PREFIX}/bin/meson compile
 
   cd "${srcdir}"
-  [[ -d build-static-${MSYSTEM} ]] && rm -rf build-static-${MSYSTEM}
-  mkdir -p build-static-${MSYSTEM}
-  cd build-static-${MSYSTEM}
+  mkdir -p build-static-${MSYSTEM} && cd build-static-${MSYSTEM}
 
   CFLAGS+=" ${_static_flags[@]}" \
   CXXFLAGS+=" ${_static_flags[@]}" \
diff --git a/mingw-w64-parsec/PKGBUILD b/mingw-w64-parsec/PKGBUILD
index ce71b8f2a8ae9..f62325e499f3e 100644
--- a/mingw-w64-parsec/PKGBUILD
+++ b/mingw-w64-parsec/PKGBUILD
@@ -26,7 +26,6 @@ prepare() {
 
 build() {
   #Static Build
-  [[ -d "${srcdir}/build-${MSYSTEM}-static" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-static"
   mkdir -p "${srcdir}/build-${MSYSTEM}-static" && cd "${srcdir}/build-${MSYSTEM}-static"
 
   # for asprintf
diff --git a/mingw-w64-pastix/PKGBUILD b/mingw-w64-pastix/PKGBUILD
index b263b30859839..6746e87bca583 100644
--- a/mingw-w64-pastix/PKGBUILD
+++ b/mingw-w64-pastix/PKGBUILD
@@ -49,13 +49,7 @@ prepare() {
 }
 
 build() {
-  local _arch_opt=""
-  if [ "${CARCH}" = "i686" ]; then
-    _arch_opt="-DBUILD_64bits=OFF"
-  fi
-
   #Static Build
-  [[ -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=" \
@@ -80,7 +74,6 @@ build() {
   ${MINGW_PREFIX}/bin/cmake --build .
 
   #Shared Build
-  [[ -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=" \
diff --git a/mingw-w64-pcre/PKGBUILD b/mingw-w64-pcre/PKGBUILD
index c9fff6d9cc7a6..1f154170d638a 100644
--- a/mingw-w64-pcre/PKGBUILD
+++ b/mingw-w64-pcre/PKGBUILD
@@ -31,7 +31,6 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   "${srcdir}"/${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-portablexdr/PKGBUILD b/mingw-w64-portablexdr/PKGBUILD
index 8f336b4ceced3..3f97f3ba7a39d 100644
--- a/mingw-w64-portablexdr/PKGBUILD
+++ b/mingw-w64-portablexdr/PKGBUILD
@@ -27,9 +27,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "$srcdir/build-${MSYSTEM}" ]] && rm -rf "$srcdir/build-${MSYSTEM}"
-  mkdir "$srcdir/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "$srcdir/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}/configure \
       --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-portaudio/PKGBUILD b/mingw-w64-portaudio/PKGBUILD
index 786fb88314dca..a9c8ffe2b8e30 100644
--- a/mingw-w64-portaudio/PKGBUILD
+++ b/mingw-w64-portaudio/PKGBUILD
@@ -44,9 +44,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   declare -a extra_config
   if check_option "debug" "n"; then
diff --git a/mingw-w64-portsmf/PKGBUILD b/mingw-w64-portsmf/PKGBUILD
index 4b7006991d938..d187ed0dcfb4c 100644
--- a/mingw-w64-portsmf/PKGBUILD
+++ b/mingw-w64-portsmf/PKGBUILD
@@ -39,9 +39,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}/configure \
       --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-potrace/PKGBUILD b/mingw-w64-potrace/PKGBUILD
index 31e8b7af19c4e..b8159dfc7e492 100644
--- a/mingw-w64-potrace/PKGBUILD
+++ b/mingw-w64-potrace/PKGBUILD
@@ -27,7 +27,6 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-pqp/PKGBUILD b/mingw-w64-pqp/PKGBUILD
index 4ac70f2f362a6..6c795e99e3f1d 100644
--- a/mingw-w64-pqp/PKGBUILD
+++ b/mingw-w64-pqp/PKGBUILD
@@ -19,8 +19,6 @@ source=("${_realname}-${pkgver}.tar.gz::https://github.com/GammaUNC/PQP/archive/
 sha256sums=('ae33a4506d70b68176d4e56d60bcc5760f46cc4e71d5856c02fd82db5026457f')
 
 build() {
-  cd "${srcdir}"/PQP-${_commit}
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   declare -a extra_config
diff --git a/mingw-w64-ptex/PKGBUILD b/mingw-w64-ptex/PKGBUILD
index c34d6d42a4f0c..927a5e563a414 100644
--- a/mingw-w64-ptex/PKGBUILD
+++ b/mingw-w64-ptex/PKGBUILD
@@ -54,7 +54,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   declare -a extra_config
diff --git a/mingw-w64-pulseaudio/PKGBUILD b/mingw-w64-pulseaudio/PKGBUILD
index bfb034fd9fea4..b2398293d6d7a 100644
--- a/mingw-w64-pulseaudio/PKGBUILD
+++ b/mingw-w64-pulseaudio/PKGBUILD
@@ -43,8 +43,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   declare -a _extra_config
   if check_option "debug" "n"; then
diff --git a/mingw-w64-pygobject/PKGBUILD b/mingw-w64-pygobject/PKGBUILD
index 04ebb93229aa9..aef962048fb98 100644
--- a/mingw-w64-pygobject/PKGBUILD
+++ b/mingw-w64-pygobject/PKGBUILD
@@ -38,7 +38,6 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
diff --git a/mingw-w64-qhull/PKGBUILD b/mingw-w64-qhull/PKGBUILD
index 214416ac17793..fbbd50eb97e7f 100644
--- a/mingw-w64-qhull/PKGBUILD
+++ b/mingw-w64-qhull/PKGBUILD
@@ -30,7 +30,6 @@ prepare() {
 }
 
 build() {
-  [[ -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=" \
diff --git a/mingw-w64-qrencode/PKGBUILD b/mingw-w64-qrencode/PKGBUILD
index 0dc48efc4a8b9..3eb54eed0ad88 100644
--- a/mingw-w64-qrencode/PKGBUILD
+++ b/mingw-w64-qrencode/PKGBUILD
@@ -20,7 +20,6 @@ source=(https://fukuchi.org/works/${_realname}/${_realname}-${pkgver}.tar.bz2)
 sha256sums=('e455d9732f8041cf5b9c388e345a641fd15707860f928e94507b1961256a6923')
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-qt5-declarative/PKGBUILD b/mingw-w64-qt5-declarative/PKGBUILD
index f3d565fc47fe2..1bdbc4ff08385 100644
--- a/mingw-w64-qt5-declarative/PKGBUILD
+++ b/mingw-w64-qt5-declarative/PKGBUILD
@@ -53,7 +53,6 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   qmake ../${_pkgfn}
diff --git a/mingw-w64-quarter/PKGBUILD b/mingw-w64-quarter/PKGBUILD
index 25c638b9dcbbf..7530038fd5886 100644
--- a/mingw-w64-quarter/PKGBUILD
+++ b/mingw-w64-quarter/PKGBUILD
@@ -25,7 +25,6 @@ source=("${msys2_repository_url}/archive/v${pkgver}/quarter-${pkgver}.tar.gz")
 sha256sums=('4fcb85c0a9e7dfd32b8a86c6a6af0087f83eaf29e3f4e8528971e59ee75cf3d7')
 
 build() {
-  [[ -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=" \
diff --git a/mingw-w64-ragel/PKGBUILD b/mingw-w64-ragel/PKGBUILD
index 28e3f82817ad7..7013c2753e45e 100644
--- a/mingw-w64-ragel/PKGBUILD
+++ b/mingw-w64-ragel/PKGBUILD
@@ -16,9 +16,7 @@ source=("https://www.colm.net/files/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('5f156edb65d20b856d638dd9ee2dfb43285914d9aa2b6ec779dac0270cd56c3f')
 
 build() {
-  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  mkdir -p "build-${MSYSTEM}"
-  cd "build-${MSYSTEM}"
+  mkdir -p "build-${MSYSTEM}" && cd "build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-range-v3/PKGBUILD b/mingw-w64-range-v3/PKGBUILD
index 6ef1577e8d4c7..84645cacfae91 100644
--- a/mingw-w64-range-v3/PKGBUILD
+++ b/mingw-w64-range-v3/PKGBUILD
@@ -17,7 +17,6 @@ source=("${_realname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz")
 sha512sums=('b8b632b8e0f2a3234ef61813212c237f648cd741e816ca57bd86f82f6459f7d755e2b70361d2aa43847874fb546a31a792ab1c3ba90292818ae7313438dc62d0')
 
 build() {
-  [[ -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=" \
diff --git a/mingw-w64-rapidjson/PKGBUILD b/mingw-w64-rapidjson/PKGBUILD
index 7a086cb9d95bc..f2d83bcd57c25 100644
--- a/mingw-w64-rapidjson/PKGBUILD
+++ b/mingw-w64-rapidjson/PKGBUILD
@@ -77,8 +77,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  mkdir "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL='-DCMAKE_INSTALL_PREFIX=' \
   ${MINGW_PREFIX}/bin/cmake.exe \
diff --git a/mingw-w64-readosm/PKGBUILD b/mingw-w64-readosm/PKGBUILD
index 1f37bfa6e6b6f..0290ab3341c86 100644
--- a/mingw-w64-readosm/PKGBUILD
+++ b/mingw-w64-readosm/PKGBUILD
@@ -24,9 +24,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${_pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-robin-hood-hashing/PKGBUILD b/mingw-w64-robin-hood-hashing/PKGBUILD
index f78c4faf011b4..2ce78207e89d9 100644
--- a/mingw-w64-robin-hood-hashing/PKGBUILD
+++ b/mingw-w64-robin-hood-hashing/PKGBUILD
@@ -18,7 +18,6 @@ source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/martinus/${_realnam
 sha512sums=('5f73e089b1e8ec41a9bedded22bc64a789d3a3d04873a2ad9f8cc2970797a473b0f4d3436c2324b3ced85a0d983998a75b1dfaf2b7f3b77235b29806ff2fd489')
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
diff --git a/mingw-w64-rxspencer/PKGBUILD b/mingw-w64-rxspencer/PKGBUILD
index 47c0f60f25998..046f61f3c98ed 100644
--- a/mingw-w64-rxspencer/PKGBUILD
+++ b/mingw-w64-rxspencer/PKGBUILD
@@ -34,7 +34,6 @@ build() {
     extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
-  [[ -d "${srcdir}/build-static-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-static-${MSYSTEM}"
   mkdir -p "${srcdir}/build-static-${MSYSTEM}" && cd "${srcdir}/build-static-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
@@ -47,7 +46,6 @@ build() {
 
   ${MINGW_PREFIX}/bin/cmake --build .
 
-  [[ -d "${srcdir}/build-shared-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-shared-${MSYSTEM}"
   mkdir -p "${srcdir}/build-shared-${MSYSTEM}" && cd "${srcdir}/build-shared-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
diff --git a/mingw-w64-sassc/PKGBUILD b/mingw-w64-sassc/PKGBUILD
index 9abc601c5e7f6..f0f262c688b3b 100644
--- a/mingw-w64-sassc/PKGBUILD
+++ b/mingw-w64-sassc/PKGBUILD
@@ -25,7 +25,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-schroedinger/PKGBUILD b/mingw-w64-schroedinger/PKGBUILD
index fa82d166c6497..b578d4700d7fc 100644
--- a/mingw-w64-schroedinger/PKGBUILD
+++ b/mingw-w64-schroedinger/PKGBUILD
@@ -33,9 +33,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-sdcv/PKGBUILD b/mingw-w64-sdcv/PKGBUILD
index 41576edb8ffc0..7fca5549f2abc 100644
--- a/mingw-w64-sdcv/PKGBUILD
+++ b/mingw-w64-sdcv/PKGBUILD
@@ -29,8 +29,7 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
-  mkdir ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   declare -a extra_config
   if check_option "debug" "n"; then
diff --git a/mingw-w64-seexpr/PKGBUILD b/mingw-w64-seexpr/PKGBUILD
index 2aa8168c3ed0d..ff66f9ab329a7 100644
--- a/mingw-w64-seexpr/PKGBUILD
+++ b/mingw-w64-seexpr/PKGBUILD
@@ -40,9 +40,7 @@ prepare() {
 
 build() {
   # Shared Build
-  [[ -d "build-${MSYSTEM}-shared" ]] && rm -rf "build-${MSYSTEM}-shared"
-  mkdir -p "${srcdir}/build-${MSYSTEM}-shared"
-  cd "${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 \
@@ -58,9 +56,7 @@ build() {
   make
   
   # Static Build
-  [[ -d "build-${MSYSTEM}-static" ]] && rm -rf "build-${MSYSTEM}-static"
-  mkdir -p "${srcdir}/build-${MSYSTEM}-static"
-  cd "${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 \
diff --git a/mingw-w64-shishi/PKGBUILD b/mingw-w64-shishi/PKGBUILD
index b84dbcd898361..55d196904ae28 100644
--- a/mingw-w64-shishi/PKGBUILD
+++ b/mingw-w64-shishi/PKGBUILD
@@ -38,9 +38,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd build-${MSYSTEM}
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd build-${MSYSTEM}
 
   ../"${_realname}-${pkgver}"/configure \
     --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-simvoleon/PKGBUILD b/mingw-w64-simvoleon/PKGBUILD
index 897dc7d596159..dbb802dff01af 100644
--- a/mingw-w64-simvoleon/PKGBUILD
+++ b/mingw-w64-simvoleon/PKGBUILD
@@ -35,7 +35,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   declare -a extra_config
diff --git a/mingw-w64-skyr-url/PKGBUILD b/mingw-w64-skyr-url/PKGBUILD
index 0385324fd5364..5a2b5e08e45d0 100644
--- a/mingw-w64-skyr-url/PKGBUILD
+++ b/mingw-w64-skyr-url/PKGBUILD
@@ -27,7 +27,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   declare -a _extra_config
diff --git a/mingw-w64-slim-simulator/PKGBUILD b/mingw-w64-slim-simulator/PKGBUILD
index 0fc965eb96d77..049174c3d02df 100644
--- a/mingw-w64-slim-simulator/PKGBUILD
+++ b/mingw-w64-slim-simulator/PKGBUILD
@@ -34,7 +34,6 @@ prepare() {
 }
 
 build() {
-  [[ -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=" \
diff --git a/mingw-w64-smpeg/PKGBUILD b/mingw-w64-smpeg/PKGBUILD
index e5f867d55d76c..1a02bbd50f058 100644
--- a/mingw-w64-smpeg/PKGBUILD
+++ b/mingw-w64-smpeg/PKGBUILD
@@ -32,7 +32,6 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}/"
 
   CFLAGS+=" -Wno-error=narrowing"
diff --git a/mingw-w64-smpeg2/PKGBUILD b/mingw-w64-smpeg2/PKGBUILD
index d3cf15153a734..fe9c82dfb2745 100644
--- a/mingw-w64-smpeg2/PKGBUILD
+++ b/mingw-w64-smpeg2/PKGBUILD
@@ -24,9 +24,7 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}/"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}/"
 
   CFLAGS+=" -Wno-error=narrowing"
   lt_cv_deplibs_check_method=pass_all \
diff --git a/mingw-w64-snappy/PKGBUILD b/mingw-w64-snappy/PKGBUILD
index 7420897ccedc6..94981deaf2f20 100644
--- a/mingw-w64-snappy/PKGBUILD
+++ b/mingw-w64-snappy/PKGBUILD
@@ -42,7 +42,6 @@ prepare() {
 
 build() {
   # Shared Build
-  [[ -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=" \
@@ -58,7 +57,6 @@ build() {
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
 
   # Static Build
-  [[ -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=" \
diff --git a/mingw-w64-snoregrowl/PKGBUILD b/mingw-w64-snoregrowl/PKGBUILD
index 4fe92007fdd35..5e7bdd4921887 100644
--- a/mingw-w64-snoregrowl/PKGBUILD
+++ b/mingw-w64-snoregrowl/PKGBUILD
@@ -21,7 +21,6 @@ source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/Snorenotify/${_real
 sha256sums=('5180628ce1c732abfc1001db48302b0d63534a3d62dc50a4655e0b4675a918be')
 
 build() {
-  [[ -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=" \
diff --git a/mingw-w64-solid3/PKGBUILD b/mingw-w64-solid3/PKGBUILD
index f312164983268..4b185079f14ec 100644
--- a/mingw-w64-solid3/PKGBUILD
+++ b/mingw-w64-solid3/PKGBUILD
@@ -32,8 +32,6 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}"/${_realname}-${_commit}
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   declare -a extra_config
diff --git a/mingw-w64-sox/PKGBUILD b/mingw-w64-sox/PKGBUILD
index 5556c73b6e33a..320f19aeb2a3e 100644
--- a/mingw-w64-sox/PKGBUILD
+++ b/mingw-w64-sox/PKGBUILD
@@ -76,7 +76,6 @@ build() {
 
   export lt_cv_deplibs_check_method='pass_all'
 
-  [[ -d "${srcdir}/build-${MSYSTEM}-static" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-static"
   mkdir -p "${srcdir}/build-${MSYSTEM}-static" && cd "${srcdir}/build-${MSYSTEM}-static"
 
   CPPFLAGS+=" -DFLAC__NO_DLL" \
@@ -90,7 +89,6 @@ build() {
 
   make
 
-  [[ -d "${srcdir}/build-${MSYSTEM}-shared" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-shared"
   mkdir -p "${srcdir}/build-${MSYSTEM}-shared" && cd "${srcdir}/build-${MSYSTEM}-shared"
 
   ../${_realname}/configure \
diff --git a/mingw-w64-spandsp/PKGBUILD b/mingw-w64-spandsp/PKGBUILD
index 1f799caeae508..03c90a7f8309c 100644
--- a/mingw-w64-spandsp/PKGBUILD
+++ b/mingw-w64-spandsp/PKGBUILD
@@ -33,7 +33,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   CPPFLAGS+=" -DLIBSPANDSP_EXPORTS" \
diff --git a/mingw-w64-sparsehash/PKGBUILD b/mingw-w64-sparsehash/PKGBUILD
index 93cb36d4ef0c1..b7ffd254ebe68 100644
--- a/mingw-w64-sparsehash/PKGBUILD
+++ b/mingw-w64-sparsehash/PKGBUILD
@@ -16,7 +16,6 @@ source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/sparsehash/sparseha
 sha256sums=('8cd1a95827dfd8270927894eb77f62b4087735cbede953884647f16c521c7e58')
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-spdylay/PKGBUILD b/mingw-w64-spdylay/PKGBUILD
index 5b1e88c5d197c..4bed5fe3eab07 100644
--- a/mingw-w64-spdylay/PKGBUILD
+++ b/mingw-w64-spdylay/PKGBUILD
@@ -29,8 +29,8 @@ prepare() {
 }
 
 build() {
-  [[ -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} \
diff --git a/mingw-w64-speex/PKGBUILD b/mingw-w64-speex/PKGBUILD
index e76a4ca9aba5f..be317a7cdc8be 100644
--- a/mingw-w64-speex/PKGBUILD
+++ b/mingw-w64-speex/PKGBUILD
@@ -27,8 +27,8 @@ prepare() {
 }
 
 build() {
-  [[ -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} \
diff --git a/mingw-w64-speexdsp/PKGBUILD b/mingw-w64-speexdsp/PKGBUILD
index 9277461b52c46..563d64b30b1fc 100644
--- a/mingw-w64-speexdsp/PKGBUILD
+++ b/mingw-w64-speexdsp/PKGBUILD
@@ -27,9 +27,10 @@ prepare() {
 }
 
 build() {
-  #export lt_cv_deplibs_check_method='pass_all'
-  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
   mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
+
+  #export lt_cv_deplibs_check_method='pass_all'
+
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-spice-protocol/PKGBUILD b/mingw-w64-spice-protocol/PKGBUILD
index 640b31bc6fbf9..b02831e474c97 100644
--- a/mingw-w64-spice-protocol/PKGBUILD
+++ b/mingw-w64-spice-protocol/PKGBUILD
@@ -23,9 +23,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
-  mkdir -p build-${MSYSTEM}
-  cd build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   meson \
diff --git a/mingw-w64-stlink/PKGBUILD b/mingw-w64-stlink/PKGBUILD
index 39c97e0edaaee..24abbb57214e2 100644
--- a/mingw-w64-stlink/PKGBUILD
+++ b/mingw-w64-stlink/PKGBUILD
@@ -31,7 +31,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   declare -a _extra_config
diff --git a/mingw-w64-stoken/PKGBUILD b/mingw-w64-stoken/PKGBUILD
index 6d221b1c0dc61..808df3611446a 100644
--- a/mingw-w64-stoken/PKGBUILD
+++ b/mingw-w64-stoken/PKGBUILD
@@ -24,9 +24,10 @@ prepare() {
 }
 
 build() {
-  #export lt_cv_deplibs_check_method='pass_all'
-  [[ -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 \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-svt-av1/PKGBUILD b/mingw-w64-svt-av1/PKGBUILD
index 5baf030d8b510..6d959007ab3af 100644
--- a/mingw-w64-svt-av1/PKGBUILD
+++ b/mingw-w64-svt-av1/PKGBUILD
@@ -29,7 +29,6 @@ build() {
     extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
-  [[ -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=" \
@@ -44,7 +43,6 @@ build() {
 
   ${MINGW_PREFIX}/bin/cmake --build .
 
-  [[ -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=" \
diff --git a/mingw-w64-t1utils/PKGBUILD b/mingw-w64-t1utils/PKGBUILD
index f15d1ba40553f..faa53bf2eb952 100644
--- a/mingw-w64-t1utils/PKGBUILD
+++ b/mingw-w64-t1utils/PKGBUILD
@@ -39,9 +39,8 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}"/${_realname}-${pkgver}
-  [[ -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} \
diff --git a/mingw-w64-tcl/PKGBUILD b/mingw-w64-tcl/PKGBUILD
index c94e18f4dc18e..4fd0cd9cbbdd5 100644
--- a/mingw-w64-tcl/PKGBUILD
+++ b/mingw-w64-tcl/PKGBUILD
@@ -72,9 +72,8 @@ build() {
   [[ "${MINGW_CHOST}" = "x86_64-w64-mingw32" ]] && enable64bit='--enable-64bit=amd64'
   [[ "${MINGW_CHOST}" = "aarch64-w64-mingw32" ]] && enable64bit='--enable-64bit=arm64'
 
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
-  mkdir -p ${srcdir}/build-${MSYSTEM}
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd "${srcdir}/build-${MSYSTEM}"
+
   ${srcdir}/tcl${pkgver}/win/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-termcap/PKGBUILD b/mingw-w64-termcap/PKGBUILD
index 3ff10e0117e52..95875e103abf5 100644
--- a/mingw-w64-termcap/PKGBUILD
+++ b/mingw-w64-termcap/PKGBUILD
@@ -27,8 +27,7 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
-  mkdir ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-tetgen/PKGBUILD b/mingw-w64-tetgen/PKGBUILD
index 8832e39bee8e7..ad5860c1371e2 100644
--- a/mingw-w64-tetgen/PKGBUILD
+++ b/mingw-w64-tetgen/PKGBUILD
@@ -24,7 +24,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   declare -a extra_config
diff --git a/mingw-w64-tgui/PKGBUILD b/mingw-w64-tgui/PKGBUILD
index f616bc59bf76f..6ccdaefdec453 100644
--- a/mingw-w64-tgui/PKGBUILD
+++ b/mingw-w64-tgui/PKGBUILD
@@ -30,7 +30,6 @@ build() {
   fi
 
   # static build
-  [[ -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 \
@@ -43,7 +42,6 @@ build() {
   ${MINGW_PREFIX}/bin/cmake --build .
 
   # shared build
-  [[ -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 \
diff --git a/mingw-w64-thor/PKGBUILD b/mingw-w64-thor/PKGBUILD
index ff4090bb706d0..44aeae5bde2d8 100644
--- a/mingw-w64-thor/PKGBUILD
+++ b/mingw-w64-thor/PKGBUILD
@@ -36,7 +36,6 @@ build() {
   fi
 
   # shared build
-  [[ -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 \
@@ -48,7 +47,6 @@ build() {
   ${MINGW_PREFIX}/bin/cmake --build .
 
   # static build
-  [[ -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 \
diff --git a/mingw-w64-tidy/PKGBUILD b/mingw-w64-tidy/PKGBUILD
index a99ac57cc942e..369b6616dcb0e 100644
--- a/mingw-w64-tidy/PKGBUILD
+++ b/mingw-w64-tidy/PKGBUILD
@@ -30,7 +30,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "$srcdir}/build-${MSYSTEM}" ]] && rm -rf "$srcdir/build-${MSYSTEM}"
   mkdir -p "$srcdir/build-${MSYSTEM}" && cd "$srcdir/build-${MSYSTEM}"
 
   declare -a extra_config
diff --git a/mingw-w64-tinyxml2/PKGBUILD b/mingw-w64-tinyxml2/PKGBUILD
index a93661d833c25..860ee681f3608 100644
--- a/mingw-w64-tinyxml2/PKGBUILD
+++ b/mingw-w64-tinyxml2/PKGBUILD
@@ -29,7 +29,6 @@ build() {
   fi
 
   msg2 "Build static libs"
-  [[ -d ${srcdir}/build-static-${MSYSTEM} ]] && rm -rf ${srcdir}/build-static-${MSYSTEM}
   mkdir ${srcdir}/build-static-${MSYSTEM} && cd ${srcdir}/build-static-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
@@ -42,7 +41,6 @@ build() {
   ${MINGW_PREFIX}/bin/cmake --build .
 
   msg2 "Build shared libs"
-  [[ -d ${srcdir}/build-shared-${MSYSTEM} ]] && rm -rf ${srcdir}/build-shared-${MSYSTEM}
   mkdir ${srcdir}/build-shared-${MSYSTEM} && cd ${srcdir}/build-shared-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
diff --git a/mingw-w64-tk/PKGBUILD b/mingw-w64-tk/PKGBUILD
index 9c0f0236132f1..bf9acdc991d2c 100644
--- a/mingw-w64-tk/PKGBUILD
+++ b/mingw-w64-tk/PKGBUILD
@@ -58,9 +58,8 @@ build() {
   [[ "${MINGW_CHOST}" = 'x86_64-w64-mingw32' ]] && enable64bit='--enable-64bit'
   [[ "${MINGW_CHOST}" = 'aarch64-w64-mingw32' ]] && enable64bit='--enable-64bit=arm64'
 
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
-  mkdir -p ${srcdir}/build-${MSYSTEM}
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd "${srcdir}/build-${MSYSTEM}"
+
   ${srcdir}/tk${_basever}/win/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-tktable/PKGBUILD b/mingw-w64-tktable/PKGBUILD
index b170efa90547f..8000468179efb 100644
--- a/mingw-w64-tktable/PKGBUILD
+++ b/mingw-w64-tktable/PKGBUILD
@@ -32,9 +32,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   [[ "${MINGW_CHOST}" = 'x86_64-w64-mingw32' ]] && enable64bit='--enable-64bit'
 
diff --git a/mingw-w64-tmxlite/PKGBUILD b/mingw-w64-tmxlite/PKGBUILD
index 1f49f590a3f74..fa9de26cbce90 100644
--- a/mingw-w64-tmxlite/PKGBUILD
+++ b/mingw-w64-tmxlite/PKGBUILD
@@ -22,7 +22,6 @@ source=("${_realname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz")
 sha256sums=('ec8893efc8396308f291c284cb09f007441a15aabbb0e5722096cf79c65c9e58')
 
 build() {
-  [[ -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=" \
@@ -35,7 +34,6 @@ build() {
     ../${_realname}-${pkgver}/${_realname}
   cmake --build .
 
-  [[ -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=" \
diff --git a/mingw-w64-toml11/PKGBUILD b/mingw-w64-toml11/PKGBUILD
index 9cc0f6f59e302..50212d5f61ee1 100644
--- a/mingw-w64-toml11/PKGBUILD
+++ b/mingw-w64-toml11/PKGBUILD
@@ -14,12 +14,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-cmake")
 source=("https://github.com/ToruNiina/toml11/archive/v${pkgver}.tar.gz")
 sha256sums=('9287971cd4a1a3992ef37e7b95a3972d1ae56410e7f8e3f300727ab1d6c79c2c')
 
-prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-}
-
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   declare -a extra_config
diff --git a/mingw-w64-totem-pl-parser/PKGBUILD b/mingw-w64-totem-pl-parser/PKGBUILD
index e9b75ee192c5a..caf08a6abcb82 100644
--- a/mingw-w64-totem-pl-parser/PKGBUILD
+++ b/mingw-w64-totem-pl-parser/PKGBUILD
@@ -37,7 +37,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
diff --git a/mingw-w64-twolame/PKGBUILD b/mingw-w64-twolame/PKGBUILD
index 2b045eefbd27b..88841d21ab2c1 100644
--- a/mingw-w64-twolame/PKGBUILD
+++ b/mingw-w64-twolame/PKGBUILD
@@ -32,9 +32,8 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir -p build-${MSYSTEM}
-  cd build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
+
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-uchardet/PKGBUILD b/mingw-w64-uchardet/PKGBUILD
index 6f12d5a7e7b01..837190dfbd1b9 100644
--- a/mingw-w64-uchardet/PKGBUILD
+++ b/mingw-w64-uchardet/PKGBUILD
@@ -25,8 +25,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -r "${srcdir}/build-${MSYSTEM}"
-  mkdir "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
diff --git a/mingw-w64-ucl/PKGBUILD b/mingw-w64-ucl/PKGBUILD
index f68fb3776b29b..ecbc8ceedccf7 100644
--- a/mingw-w64-ucl/PKGBUILD
+++ b/mingw-w64-ucl/PKGBUILD
@@ -36,9 +36,8 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}"/${_realname}-${pkgver}
-  [[ -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} \
diff --git a/mingw-w64-udis86/PKGBUILD b/mingw-w64-udis86/PKGBUILD
index e53af914c111c..b7e0e3dbf743e 100644
--- a/mingw-w64-udis86/PKGBUILD
+++ b/mingw-w64-udis86/PKGBUILD
@@ -36,13 +36,13 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
   ../${_realname}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
     --host=${MINGW_CHOST}
+
   make
 }
 
diff --git a/mingw-w64-udunits/PKGBUILD b/mingw-w64-udunits/PKGBUILD
index 9f065927a5328..f5019b9d7a324 100644
--- a/mingw-w64-udunits/PKGBUILD
+++ b/mingw-w64-udunits/PKGBUILD
@@ -18,7 +18,6 @@ source=("https://artifacts.unidata.ucar.edu/repository/downloads-udunits/${pkgve
 sha256sums=('e09d31db68f9a840a0663c7e9909101957733ff0310761b9906f4722e0d92c44')
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   declare -a extra_config
diff --git a/mingw-w64-uhttpmock/PKGBUILD b/mingw-w64-uhttpmock/PKGBUILD
index c9b81084929a4..f18fee1151212 100644
--- a/mingw-w64-uhttpmock/PKGBUILD
+++ b/mingw-w64-uhttpmock/PKGBUILD
@@ -33,9 +33,7 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir -p build-${MSYSTEM}
-  cd build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
     --host=${MINGW_CHOST} \
diff --git a/mingw-w64-unixodbc/PKGBUILD b/mingw-w64-unixodbc/PKGBUILD
index 19e1f28ae4a8a..51b9c917b87d0 100644
--- a/mingw-w64-unixodbc/PKGBUILD
+++ b/mingw-w64-unixodbc/PKGBUILD
@@ -40,7 +40,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   ../unixODBC-${pkgver}/configure \
diff --git a/mingw-w64-usrsctp/PKGBUILD b/mingw-w64-usrsctp/PKGBUILD
index 0f5f1f64b990b..5bc38bacd37a4 100644
--- a/mingw-w64-usrsctp/PKGBUILD
+++ b/mingw-w64-usrsctp/PKGBUILD
@@ -34,7 +34,6 @@ build() {
     extra_config+=("")
   fi
 
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
diff --git a/mingw-w64-vala/PKGBUILD b/mingw-w64-vala/PKGBUILD
index 3a9e202553d5e..e6880241b6ea6 100644
--- a/mingw-w64-vala/PKGBUILD
+++ b/mingw-w64-vala/PKGBUILD
@@ -37,7 +37,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-vcdimager/PKGBUILD b/mingw-w64-vcdimager/PKGBUILD
index f5fdce86a49dd..d1b1186a63d9b 100644
--- a/mingw-w64-vcdimager/PKGBUILD
+++ b/mingw-w64-vcdimager/PKGBUILD
@@ -31,8 +31,8 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
+
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-vid.stab/PKGBUILD b/mingw-w64-vid.stab/PKGBUILD
index 11e13942dbf7f..5578449ffaa28 100644
--- a/mingw-w64-vid.stab/PKGBUILD
+++ b/mingw-w64-vid.stab/PKGBUILD
@@ -45,7 +45,6 @@ build() {
   cd "$srcdir"/${_realname}-${pkgver}
 
   msg2 "Building shared library"
-  [[ -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
@@ -67,7 +66,6 @@ build() {
 
 
   msg2 "Building static library"
-  [[ -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=" \
diff --git a/mingw-w64-vo-amrwbenc/PKGBUILD b/mingw-w64-vo-amrwbenc/PKGBUILD
index bd932130f3294..0025358837714 100644
--- a/mingw-w64-vo-amrwbenc/PKGBUILD
+++ b/mingw-w64-vo-amrwbenc/PKGBUILD
@@ -21,9 +21,8 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}"/${_realname}-${pkgver}
-  [[ -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} \
diff --git a/mingw-w64-webp-pixbuf-loader/PKGBUILD b/mingw-w64-webp-pixbuf-loader/PKGBUILD
index f92fc10c83241..9e61a354a1414 100644
--- a/mingw-w64-webp-pixbuf-loader/PKGBUILD
+++ b/mingw-w64-webp-pixbuf-loader/PKGBUILD
@@ -23,7 +23,6 @@ source=("${_realname}-${pkgver}.tar.gz::https://github.com/aruiz/webp-pixbuf-loa
 sha256sums=('61ce5e8e036043f9d0e78c1596a621788e879c52aedf72ab5e78a8c44849411a')
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
diff --git a/mingw-w64-webrtc-audio-processing/PKGBUILD b/mingw-w64-webrtc-audio-processing/PKGBUILD
index 252512ae731d8..c5c36d03f8f21 100644
--- a/mingw-w64-webrtc-audio-processing/PKGBUILD
+++ b/mingw-w64-webrtc-audio-processing/PKGBUILD
@@ -31,7 +31,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-v${pkgver}/configure \
diff --git a/mingw-w64-win7appid/PKGBUILD b/mingw-w64-win7appid/PKGBUILD
index c1cc4d0b4f588..9ef108ce5686d 100644
--- a/mingw-w64-win7appid/PKGBUILD
+++ b/mingw-w64-win7appid/PKGBUILD
@@ -31,7 +31,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   c++ -O1 -municode -DWIN32_LEAN_AND_MEAN=1 -DUNICODE -D_UNICODE \
diff --git a/mingw-w64-x264/PKGBUILD b/mingw-w64-x264/PKGBUILD
index 9b2d814d36b1d..e6f34603afcfd 100644
--- a/mingw-w64-x264/PKGBUILD
+++ b/mingw-w64-x264/PKGBUILD
@@ -43,9 +43,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
   ../${_realname}/configure \
     --prefix=${MINGW_PREFIX} \
     --host=${MINGW_CHOST} \
diff --git a/mingw-w64-xlnt/PKGBUILD b/mingw-w64-xlnt/PKGBUILD
index 13d6978ca5fbe..de596fbe360cd 100644
--- a/mingw-w64-xlnt/PKGBUILD
+++ b/mingw-w64-xlnt/PKGBUILD
@@ -40,7 +40,6 @@ build() {
   fi
 
   echo "Building static library"
-  [[ -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=" \
@@ -56,7 +55,6 @@ build() {
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
 
   echo "Building shared library"
-  [[ -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=" \
diff --git a/mingw-w64-yasm/PKGBUILD b/mingw-w64-yasm/PKGBUILD
index 6d55a3cc6da0f..eb075064c34b4 100644
--- a/mingw-w64-yasm/PKGBUILD
+++ b/mingw-w64-yasm/PKGBUILD
@@ -27,8 +27,8 @@ prepare() {
 }
 
 build() {
-  [[ -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} \
diff --git a/mingw-w64-yelp-tools/PKGBUILD b/mingw-w64-yelp-tools/PKGBUILD
index 187470762c639..af6268b61830b 100644
--- a/mingw-w64-yelp-tools/PKGBUILD
+++ b/mingw-w64-yelp-tools/PKGBUILD
@@ -31,7 +31,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   declare -a extra_config
diff --git a/mingw-w64-yelp-xsl/PKGBUILD b/mingw-w64-yelp-xsl/PKGBUILD
index b546f4ff0aeec..78256605a6f4c 100644
--- a/mingw-w64-yelp-xsl/PKGBUILD
+++ b/mingw-w64-yelp-xsl/PKGBUILD
@@ -26,7 +26,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   PYTHON=${MINGW_PREFIX}/bin/python \
diff --git a/mingw-w64-yubico-c/PKGBUILD b/mingw-w64-yubico-c/PKGBUILD
index a03524f585cc5..0023f0d5ebc9f 100644
--- a/mingw-w64-yubico-c/PKGBUILD
+++ b/mingw-w64-yubico-c/PKGBUILD
@@ -27,8 +27,6 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}"/${_shortname}-${pkgver}
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   ../${_shortname}-${pkgver}/configure \
diff --git a/mingw-w64-zimg/PKGBUILD b/mingw-w64-zimg/PKGBUILD
index d19f2b0f5a643..74ea765ef24f5 100644
--- a/mingw-w64-zimg/PKGBUILD
+++ b/mingw-w64-zimg/PKGBUILD
@@ -29,9 +29,7 @@ prepare(){
 }
 
 build() {
-  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-release-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-zopfli/PKGBUILD b/mingw-w64-zopfli/PKGBUILD
index d4708348145d5..4070d802d2e33 100644
--- a/mingw-w64-zopfli/PKGBUILD
+++ b/mingw-w64-zopfli/PKGBUILD
@@ -51,7 +51,6 @@ prepare() {
 }
 
 build() {
-  [[ -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
@@ -70,7 +69,6 @@ build() {
       ../zopfli-zopfli-${pkgver}
   make
 
-  [[ -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 \
diff --git a/mingw-w64-zxing-cpp/PKGBUILD b/mingw-w64-zxing-cpp/PKGBUILD
index 2c969ea31d81c..b2aaf93db1541 100644
--- a/mingw-w64-zxing-cpp/PKGBUILD
+++ b/mingw-w64-zxing-cpp/PKGBUILD
@@ -26,10 +26,7 @@ prepare() {
 
 build() {
   # Shared Build
-  [[ -d "build-${MSYSTEM}-shared" ]] && rm -rf "build-${MSYSTEM}-shared"
-
-  mkdir -p ${srcdir}/build-${MSYSTEM}-shared
-  cd ${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 \
@@ -44,10 +41,7 @@ build() {
   ${MINGW_PREFIX}/bin/cmake.exe --build .
 
   # Static Build
-  [[ -d "build-${MSYSTEM}-static" ]] && rm -rf "build-${MSYSTEM}-static"
-
-  mkdir -p ${srcdir}/build-${MSYSTEM}-static
-  cd ${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 \
diff --git a/mingw-w64-zziplib/PKGBUILD b/mingw-w64-zziplib/PKGBUILD
index bf8f87fc2f03a..7be18a5e03730 100644
--- a/mingw-w64-zziplib/PKGBUILD
+++ b/mingw-w64-zziplib/PKGBUILD
@@ -48,7 +48,6 @@ build() {
   fi
 
   echo "Building static library"
-  [[ -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=" \
@@ -63,7 +62,6 @@ build() {
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
 
   echo "Building shared library"
-  [[ -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=" \