From b38b2b78f47fbd08494bdbda7484dd2d409ea466 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Fri, 27 Jun 2025 07:42:37 +0200
Subject: [PATCH] Remove all cygwin CHOST changes

Since #5448 CHOST defaults to cygwin now, so this
is no longer needed.
---
 apr-util/PKGBUILD                             |  3 +--
 apr/PKGBUILD                                  |  3 +--
 bash/PKGBUILD                                 |  3 +--
 binutils/PKGBUILD                             |  3 +--
 bison/PKGBUILD                                |  3 +--
 cgdb/PKGBUILD                                 |  3 +--
 cpio/PKGBUILD                                 |  7 +++---
 curl/PKGBUILD                                 |  3 +--
 cygrunsrv/PKGBUILD                            |  7 +++---
 cygutils/PKGBUILD                             |  7 +++---
 cyrus-sasl/PKGBUILD                           |  5 ++--
 db/PKGBUILD                                   |  3 +--
 dialog/PKGBUILD                               |  5 ++--
 diffstat/PKGBUILD                             |  3 +--
 diffutils/PKGBUILD                            |  3 +--
 ed/PKGBUILD                                   |  3 +--
 elinks/PKGBUILD                               |  3 +--
 emacs/PKGBUILD                                |  3 +--
 enscript/PKGBUILD                             |  3 +--
 expect/PKGBUILD                               |  3 +--
 file/PKGBUILD                                 |  7 +++---
 findutils/PKGBUILD                            |  3 +--
 flex/PKGBUILD                                 |  3 +--
 gawk/PKGBUILD                                 |  5 ++--
 gcc/PKGBUILD                                  | 23 ++++++++-----------
 gdb/PKGBUILD                                  |  3 +--
 gdbm/PKGBUILD                                 |  3 +--
 gengetopt/PKGBUILD                            |  3 +--
 getent/PKGBUILD                               |  7 +++---
 gettext/PKGBUILD                              |  6 ++---
 git/PKGBUILD                                  |  3 +--
 gnu-netcat/PKGBUILD                           |  3 +--
 gnupg/PKGBUILD                                |  3 +--
 gnutls/PKGBUILD                               |  3 +--
 gperf/PKGBUILD                                |  3 +--
 gpgme/PKGBUILD                                |  3 +--
 grep/PKGBUILD                                 |  3 +--
 groff/PKGBUILD                                |  3 +--
 gzip/PKGBUILD                                 |  3 +--
 heimdal/PKGBUILD                              |  7 +++---
 icu/PKGBUILD                                  |  3 +--
 inetutils/PKGBUILD                            |  3 +--
 isl/PKGBUILD                                  |  3 +--
 jansson/PKGBUILD                              |  3 +--
 lftp/PKGBUILD                                 |  3 +--
 libarchive/PKGBUILD                           |  3 +--
 libargp/PKGBUILD                              |  7 +++---
 libassuan/PKGBUILD                            |  6 ++---
 libatomic_ops/PKGBUILD                        |  7 +++---
 libbsd/PKGBUILD                               |  3 +--
 libedit/PKGBUILD                              |  3 +--
 libgcrypt/PKGBUILD                            |  3 +--
 libgpg-error/PKGBUILD                         |  3 +--
 libiconv/PKGBUILD                             |  3 +--
 libidn/PKGBUILD                               |  3 +--
 libidn2/PKGBUILD                              |  3 +--
 libksba/PKGBUILD                              |  3 +--
 libpipeline/PKGBUILD                          |  3 +--
 libqrencode/PKGBUILD                          |  3 +--
 libssh2/PKGBUILD                              |  3 +--
 libtasn1/PKGBUILD                             |  3 +--
 libtirpc/PKGBUILD                             |  3 +--
 libtool/PKGBUILD                              |  3 +--
 libunistring/PKGBUILD                         |  3 +--
 libuv/PKGBUILD                                |  5 ++--
 libxcrypt/PKGBUILD                            |  7 +++---
 libxml2/PKGBUILD                              |  7 +++---
 libxslt/PKGBUILD                              |  7 +++---
 libyaml/PKGBUILD                              |  3 +--
 lndir/PKGBUILD                                |  3 +--
 lynx/PKGBUILD                                 |  3 +--
 lzo2/PKGBUILD                                 |  3 +--
 man-db/PKGBUILD                               |  3 +--
 mc/PKGBUILD                                   |  3 +--
 mingw-w64-cross-binutils/PKGBUILD             |  5 ++--
 mingw-w64-cross-gcc/PKGBUILD                  |  5 ++--
 mingw-w64-cross-mingwarm64-binutils/PKGBUILD  |  5 ++--
 mingw-w64-cross-mingwarm64-gcc/PKGBUILD       |  5 ++--
 .../PKGBUILD                                  |  3 +--
 .../PKGBUILD                                  |  3 +--
 mosh/PKGBUILD                                 |  5 ++--
 mpc/PKGBUILD                                  |  3 +--
 mpfr/PKGBUILD                                 |  3 +--
 msys2-runtime-3.3/PKGBUILD                    |  8 +++----
 msys2-runtime-3.4/PKGBUILD                    |  8 +++----
 msys2-runtime-3.5/PKGBUILD                    |  8 +++----
 msys2-runtime/PKGBUILD                        | 10 ++++----
 nano/PKGBUILD                                 |  3 +--
 neon/PKGBUILD                                 |  3 +--
 nettle/PKGBUILD                               |  3 +--
 nghttp2/PKGBUILD                              |  3 +--
 npth/PKGBUILD                                 |  7 +++---
 opensp/PKGBUILD                               |  3 +--
 openssh/PKGBUILD                              |  3 +--
 patch/PKGBUILD                                |  3 +--
 pcre/PKGBUILD                                 |  3 +--
 pcre2/PKGBUILD                                |  3 +--
 pinentry/PKGBUILD                             |  3 +--
 pkgconf/PKGBUILD                              |  3 +--
 procps-ng/PKGBUILD                            |  3 +--
 python/PKGBUILD                               |  5 ++--
 rcs/PKGBUILD                                  |  3 +--
 readline/PKGBUILD                             | 10 ++++----
 rebase/PKGBUILD                               |  3 +--
 remake/PKGBUILD                               |  3 +--
 rpcsvc-proto/PKGBUILD                         |  7 +++---
 rsync/PKGBUILD                                |  3 +--
 ruby/PKGBUILD                                 |  3 +--
 sed/PKGBUILD                                  |  3 +--
 sqlite/PKGBUILD                               |  3 +--
 subversion/PKGBUILD                           |  3 +--
 swig/PKGBUILD                                 |  3 +--
 tar/PKGBUILD                                  |  3 +--
 tcl/PKGBUILD                                  |  3 +--
 tcsh/PKGBUILD                                 |  7 +++---
 texinfo/PKGBUILD                              |  3 +--
 tftp-hpa/PKGBUILD                             |  3 +--
 time/PKGBUILD                                 |  3 +--
 tmate/PKGBUILD                                |  3 +--
 tmux/PKGBUILD                                 |  3 +--
 ucl/PKGBUILD                                  |  3 +--
 util-linux/PKGBUILD                           |  3 +--
 wget/PKGBUILD                                 |  3 +--
 windows-default-manifest/PKGBUILD             |  3 +--
 xorriso/PKGBUILD                              |  5 ++--
 xz/PKGBUILD                                   |  1 -
 yasm/PKGBUILD                                 |  3 +--
 zlib/PKGBUILD                                 |  1 -
 128 files changed, 190 insertions(+), 323 deletions(-)

diff --git a/apr-util/PKGBUILD b/apr-util/PKGBUILD
index 63573b2c..12a1d50c 100644
--- a/apr-util/PKGBUILD
+++ b/apr-util/PKGBUILD
@@ -29,9 +29,8 @@ build() {
   cd "${srcdir}/apr-util-${pkgver}"
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     --with-apr=/usr \
     --with-expat=/usr \
diff --git a/apr/PKGBUILD b/apr/PKGBUILD
index 70d192bc..ddd0dd95 100644
--- a/apr/PKGBUILD
+++ b/apr/PKGBUILD
@@ -25,9 +25,8 @@ build() {
   cd "${srcdir}/apr-${pkgver}"
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-      --build=${CYGWIN_CHOST} \
+      --build=${CHOST} \
       --prefix=/usr \
       --libexecdir=/usr/lib/apr/modules \
       --datadir=/usr/share/apr \
diff --git a/bash/PKGBUILD b/bash/PKGBUILD
index 3f61a0c3..6b0dd999 100644
--- a/bash/PKGBUILD
+++ b/bash/PKGBUILD
@@ -54,8 +54,7 @@ build() {
   cd ${srcdir}/${pkgname}-$_basever
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
-  ./configure --build=${CYGWIN_CHOST} \
+  ./configure --build=${CHOST} \
     --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
diff --git a/binutils/PKGBUILD b/binutils/PKGBUILD
index 69d03ab6..e5cf407c 100644
--- a/binutils/PKGBUILD
+++ b/binutils/PKGBUILD
@@ -41,13 +41,12 @@ prepare() {
 }
 
 build() {
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   export MSYSTEM=CYGWIN
 
   cd "${srcdir}"/binutils-${CARCH}
   ../binutils-${pkgver}/configure \
     --prefix=/usr \
-    --{build,host,target}=${CYGWIN_CHOST} \
+    --{build,host,target}=${CHOST} \
     --disable-werror \
     --disable-sim \
     --enable-64-bit-bfd \
diff --git a/bison/PKGBUILD b/bison/PKGBUILD
index a48cd881..9a908258 100644
--- a/bison/PKGBUILD
+++ b/bison/PKGBUILD
@@ -27,9 +27,8 @@ prepare() {
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure -C \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     gl_cv_have_weak=no
   make
diff --git a/cgdb/PKGBUILD b/cgdb/PKGBUILD
index 024690e3..3604fd72 100644
--- a/cgdb/PKGBUILD
+++ b/cgdb/PKGBUILD
@@ -23,13 +23,12 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
 
   CFLAGS+=" -D_GNU_SOURCE"
   CXXFLAGS+="   -D_GNU_SOURCE"
   ./configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --with-readline=/usr \
     --with-ncurses=/usr
   
diff --git a/cpio/PKGBUILD b/cpio/PKGBUILD
index 56b64692..9b68ebd7 100644
--- a/cpio/PKGBUILD
+++ b/cpio/PKGBUILD
@@ -20,11 +20,10 @@ sha256sums=('efa50ef983137eefc0a02fdb51509d624b5e3295c980aa127ceee4183455499e')
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CYGWIN_CHOST} \
-    --host=${CYGWIN_CHOST} \
-    --target=${CYGWIN_CHOST} \
+    --build=${CHOST} \
+    --host=${CHOST} \
+    --target=${CHOST} \
     --prefix=/usr
 
   make
diff --git a/curl/PKGBUILD b/curl/PKGBUILD
index e2ec099b..c87ebf5f 100644
--- a/curl/PKGBUILD
+++ b/curl/PKGBUILD
@@ -44,9 +44,8 @@ build() {
     extra_config+=("--enable-debug")
   fi
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     --enable-shared \
     --enable-static \
diff --git a/cygrunsrv/PKGBUILD b/cygrunsrv/PKGBUILD
index c773d137..7cea9eff 100644
--- a/cygrunsrv/PKGBUILD
+++ b/cygrunsrv/PKGBUILD
@@ -27,12 +27,11 @@ build() {
   cd "${srcdir}/build-${CHOST}"
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ../${pkgname}-${pkgver}/configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
-    --host=${CYGWIN_CHOST} \
-    --target=${CYGWIN_CHOST}
+    --build=${CHOST} \
+    --host=${CHOST} \
+    --target=${CHOST}
 
   make
 }
diff --git a/cygutils/PKGBUILD b/cygutils/PKGBUILD
index 64cf46b1..7d19ef26 100644
--- a/cygutils/PKGBUILD
+++ b/cygutils/PKGBUILD
@@ -44,12 +44,11 @@ build() {
   CXXFLAGS+=" -std=gnu++14"
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ../${pkgname}-${_realpkgver}/configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
-    --host=${CYGWIN_CHOST} \
-    --target=${CYGWIN_CHOST}
+    --build=${CHOST} \
+    --host=${CHOST} \
+    --target=${CHOST}
 
   make
 }
diff --git a/cyrus-sasl/PKGBUILD b/cyrus-sasl/PKGBUILD
index 20a66edc..370b7eb7 100644
--- a/cyrus-sasl/PKGBUILD
+++ b/cyrus-sasl/PKGBUILD
@@ -44,12 +44,11 @@ prepare() {
 build() {
   cd ${srcdir}/${pkgname}-${_basever}
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
     --sbindir=/usr/bin \
-    --build=${CYGWIN_CHOST} \
-    --host=${CYGWIN_CHOST} \
+    --build=${CHOST} \
+    --host=${CHOST} \
     --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \
     --with-plugindir=/usr/lib/sasl2 \
     --disable-static --enable-shared \
diff --git a/db/PKGBUILD b/db/PKGBUILD
index 619c358d..525edb80 100644
--- a/db/PKGBUILD
+++ b/db/PKGBUILD
@@ -26,10 +26,9 @@ prepare() {
 build() {
   cd "${srcdir}"/$pkgname-${pkgver}/build_unix
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ../dist/configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --enable-compat185 \
     --enable-shared \
     --enable-static \
diff --git a/dialog/PKGBUILD b/dialog/PKGBUILD
index 0f6e9e1e..9e1dd2cb 100644
--- a/dialog/PKGBUILD
+++ b/dialog/PKGBUILD
@@ -15,10 +15,9 @@ sha256sums=('5d8c4318963db3fd383525340276e0e05ee3dea9a6686c20779f5433b199547d')
 build() {
   cd "$srcdir/$pkgname-${pkgver/_/-}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CYGWIN_CHOST} \
-    --host=${CYGWIN_CHOST} \
+    --build=${CHOST} \
+    --host=${CHOST} \
     --prefix=/usr \
     --enable-nls \
     --with-ncursesw
diff --git a/diffstat/PKGBUILD b/diffstat/PKGBUILD
index f9f8283e..bd319c99 100644
--- a/diffstat/PKGBUILD
+++ b/diffstat/PKGBUILD
@@ -22,8 +22,7 @@ build () {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
-  ./configure --build=${CYGWIN_CHOST} \
+  ./configure --build=${CHOST} \
     --prefix=/usr \
     --mandir=/usr/share/man
   make
diff --git a/diffutils/PKGBUILD b/diffutils/PKGBUILD
index e2b35261..d7bf8f7d 100644
--- a/diffutils/PKGBUILD
+++ b/diffutils/PKGBUILD
@@ -25,9 +25,8 @@ build() {
   # make sure tests are running OK
   sed -i "s/mkdir -m 0700/mkdir /" tests/init.sh
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     --without-libiconv-prefix \
     --without-libintl-prefix
diff --git a/ed/PKGBUILD b/ed/PKGBUILD
index ebb907da..322e67c6 100644
--- a/ed/PKGBUILD
+++ b/ed/PKGBUILD
@@ -18,9 +18,8 @@ validpgpkeys=('1D41C14B272A2219A739FA4F8FE99503132D7742') # Antonio Diaz Diaz <a
 build() {
   cd "$pkgname-$pkgver"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure --prefix=/ \
-              --build=${CYGWIN_CHOST} \
+              --build=${CHOST} \
               --bindir=/usr/bin \
               --mandir=/usr/share/man \
               --infodir=/usr/share/info \
diff --git a/elinks/PKGBUILD b/elinks/PKGBUILD
index 388a5c77..2ac8f5e3 100644
--- a/elinks/PKGBUILD
+++ b/elinks/PKGBUILD
@@ -59,14 +59,13 @@ prepare() {
 build() {
   cd "${pkgname}-${pkgver}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   export MSYSTEM=CYGWIN
   export PYTHON=/usr/bin/python3
 
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --without-openssl \
     --with-lzma \
     --without-guile \
diff --git a/emacs/PKGBUILD b/emacs/PKGBUILD
index 593334de..78241ac7 100644
--- a/emacs/PKGBUILD
+++ b/emacs/PKGBUILD
@@ -33,7 +33,6 @@ prepare() {
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
 
   CPPFLAGS="-DNDEBUG"
   CFLAGS="-pipe -O3 -fomit-frame-pointer -funroll-loops"
@@ -42,7 +41,7 @@ build() {
   # unsupported on 32-bit (and fails configure there due to this)
   ./configure \
     --prefix=/usr \
-    --build="${CYGWIN_CHOST}" \
+    --build="${CHOST}" \
     --with-x-toolkit=no \
     --with-sound=yes \
     --with-modules \
diff --git a/enscript/PKGBUILD b/enscript/PKGBUILD
index ed0ad284..ae7665f5 100644
--- a/enscript/PKGBUILD
+++ b/enscript/PKGBUILD
@@ -39,11 +39,10 @@ prepare() {
 
 build() {
   cd $pkgname-$pkgver
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc/enscript \
-    --build=${CYGWIN_CHOST}
+    --build=${CHOST}
   make
 }
 
diff --git a/expect/PKGBUILD b/expect/PKGBUILD
index 64ef0553..4eda25ab 100644
--- a/expect/PKGBUILD
+++ b/expect/PKGBUILD
@@ -29,8 +29,7 @@ prepare() {
 build() {
   cd ${srcdir}/expect${pkgver}
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
-  ./configure --build=${CYGWIN_CHOST} --prefix=/usr --mandir=/usr/share/man 
+  ./configure --build=${CHOST} --prefix=/usr --mandir=/usr/share/man 
   make SHLIB_LD='$(CC) -shared -Wl,--out-implib,$@.a'
 }
 
diff --git a/file/PKGBUILD b/file/PKGBUILD
index be3a74e5..31af4bac 100644
--- a/file/PKGBUILD
+++ b/file/PKGBUILD
@@ -38,12 +38,11 @@ prepare() {
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
-    --host=${CYGWIN_CHOST} \
-    --target=${CYGWIN_CHOST} \
+    --build=${CHOST} \
+    --host=${CHOST} \
+    --target=${CHOST} \
     --enable-fsect-man5 \
     --enable-zlib \
     --enable-bzlib \
diff --git a/findutils/PKGBUILD b/findutils/PKGBUILD
index b99c21ab..073c40de 100644
--- a/findutils/PKGBUILD
+++ b/findutils/PKGBUILD
@@ -31,7 +31,6 @@ build() {
   # which is a secure version of locate.
   # sed -i '/^SUBDIRS/s/locate//' Makefile.in
 
-  export CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   local -a extra_config
   # 32-bit cygwin only has 32-bit time_t
   # https://github.com/msys2/MSYS2-packages/issues/4078
@@ -40,7 +39,7 @@ build() {
   fi
 
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     --without-libiconv-prefix \
     --without-libintl-prefix \
diff --git a/flex/PKGBUILD b/flex/PKGBUILD
index a1f95930..6dd0bc0a 100644
--- a/flex/PKGBUILD
+++ b/flex/PKGBUILD
@@ -26,9 +26,8 @@ prepare() {
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     --without-libiconv-prefix \
     --without-libintl-prefix \
diff --git a/gawk/PKGBUILD b/gawk/PKGBUILD
index 95b3bd87..c3785e77 100644
--- a/gawk/PKGBUILD
+++ b/gawk/PKGBUILD
@@ -27,8 +27,7 @@ build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   export gl_cv_have_weak=no
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
-  ./configure --build=${CYGWIN_CHOST} \
+  ./configure --build=${CHOST} \
               --prefix=/usr \
               --libexecdir=/usr/lib \
               --without-libiconv-prefix \
@@ -49,6 +48,6 @@ package() {
   # remove unnessary import libraries of modules
   rm -fv "${pkgdir}"/usr/lib/gawk/*.dll.a
 
-  # roll-back the fake CYGWIN_CHOST in gawkbug
+  # roll-back the fake CHOST in gawkbug
   sed -E -i '/^(MACHTYPE|OS)=/ s/cygwin/msys/' "${pkgdir}"/usr/bin/gawkbug
 }
diff --git a/gcc/PKGBUILD b/gcc/PKGBUILD
index 8003940a..1c6b5db4 100644
--- a/gcc/PKGBUILD
+++ b/gcc/PKGBUILD
@@ -159,10 +159,9 @@ build() {
   export lt_cv_deplibs_check_method='pass_all'
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
 
   ${srcdir}/gcc-${pkgver}/configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     --libexecdir=/usr/lib \
     --enable-bootstrap \
@@ -200,7 +199,7 @@ build() {
   make
 
   # make documentation
-  #cd $CYGWIN_CHOST/libstdc++-v3
+  #cd $CHOST/libstdc++-v3
   #make doc-man-doxygen
 }
 
@@ -216,16 +215,15 @@ package_gcc-libs()
 {
   pkgdesc="Runtime libraries shipped by GCC"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   cd ${srcdir}/build-MSYS
-  make -j1 -C $CYGWIN_CHOST/libgcc DESTDIR=${pkgdir} install-shared
+  make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
   for lib in libgomp libstdc++-v3/src; do
-    make -j1 -C $CYGWIN_CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
+    make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
   done
 
-  make -j1 -C $CYGWIN_CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
-  make -j1 -C $CYGWIN_CHOST/libgomp DESTDIR=${pkgdir} install-info
-  make -j1 -C $CYGWIN_CHOST/libquadmath DESTDIR=${pkgdir} install-info
+  make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
+  make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
+  make -j1 -C $CHOST/libquadmath DESTDIR=${pkgdir} install-info
 
   make -j1 DESTDIR=${pkgdir} install-target-libquadmath
   #make -j1 DESTDIR=${pkgdir} install-target-libssp
@@ -254,7 +252,6 @@ package_gcc()
   conflicts=('gcc-fortran<=11.3.0-4')
 
   cd ${srcdir}/build-MSYS
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
 
   if check_option "strip" "n"; then
     export STRIP=true
@@ -270,12 +267,12 @@ package_gcc()
   rm -f ${pkgdir}/usr/bin/*.dll
 
   rm -f ${pkgdir}/usr/lib/libiberty.a
-  # rm -f ${pkgdir}/usr/lib/gcc/${CYGWIN_CHOST}/${pkgver}/libatomic{.dll,}.a
+  # rm -f ${pkgdir}/usr/lib/gcc/${CHOST}/${pkgver}/libatomic{.dll,}.a
   rm -f ${pkgdir}/usr/share/info/{libgomp,libquadmath}.info
   rm -f ${pkgdir}/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
 
   # remove static libraries - note libstdc++.a is needed for the binutils and glibc testsuite
-  #rm ${pkgdir}/usr/lib/gcc/${CYGWIN_CHOST}/${pkgver}/lib{gomp,quadmath}{.dll,}.a
+  #rm ${pkgdir}/usr/lib/gcc/${CHOST}/${pkgver}/lib{gomp,quadmath}{.dll,}.a
 
   # many packages expect this symlinks
   ln -s gcc ${pkgdir}/usr/bin/cc
@@ -313,7 +310,7 @@ EOF
   # install the libstdc++ man pages
   # install -dm755 ${pkgdir}/usr/share/man/man3
   # install -m644 -t ${pkgdir}/usr/share/man/man3 \
-  #  ${CYGWIN_CHOST}/libstdc++-v3/doc/doxygen/man/man3/*.3
+  #  ${CHOST}/libstdc++-v3/doc/doxygen/man/man3/*.3
 
   # Install Runtime Library Exception
   install -Dm644 ${srcdir}/gcc-${pkgver}/COPYING.RUNTIME \
diff --git a/gdb/PKGBUILD b/gdb/PKGBUILD
index 22c8e50a..b90a2e09 100644
--- a/gdb/PKGBUILD
+++ b/gdb/PKGBUILD
@@ -59,9 +59,8 @@ do_build() {
   mkdir -p "$builddir" && pushd "$builddir"
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ../${pkgname}-${pkgver}/configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     $2 \
     --enable-64-bit-bfd \
diff --git a/gdbm/PKGBUILD b/gdbm/PKGBUILD
index c5aa2929..ba35ea8c 100644
--- a/gdbm/PKGBUILD
+++ b/gdbm/PKGBUILD
@@ -31,10 +31,9 @@ prepare() {
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --enable-libgdbm-compat \
     COMPATINCLUDEDIR=/usr/include/gdbm
 
diff --git a/gengetopt/PKGBUILD b/gengetopt/PKGBUILD
index ebb9c4bf..f98a05d8 100644
--- a/gengetopt/PKGBUILD
+++ b/gengetopt/PKGBUILD
@@ -23,10 +23,9 @@ prepare() {
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --disable-dependency-tracking
 
   make
diff --git a/getent/PKGBUILD b/getent/PKGBUILD
index 2bdf2986..b9f39b3b 100644
--- a/getent/PKGBUILD
+++ b/getent/PKGBUILD
@@ -28,14 +28,13 @@ build() {
   mkdir -p "${srcdir}/build-${CHOST}"
   cd "${srcdir}/build-${CHOST}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
 
   CFLAGS+=" -D_GNU_SOURCE"
   ../${pkgname}-${pkgver}/configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
-    --host=${CYGWIN_CHOST} \
-    --target=${CYGWIN_CHOST}
+    --build=${CHOST} \
+    --host=${CHOST} \
+    --target=${CHOST}
 
   make
 }
diff --git a/gettext/PKGBUILD b/gettext/PKGBUILD
index 7a6523b4..0f42db94 100644
--- a/gettext/PKGBUILD
+++ b/gettext/PKGBUILD
@@ -94,11 +94,11 @@ prepare() {
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-  local CYGWIN_CHOST="$(echo "${CHOST}" | sed 's|-msys$|-cygwin|')"
+  local CHOST="$(echo "${CHOST}" | sed 's|-msys$|-cygwin|')"
 
   ./configure \
-    --build=${CYGWIN_CHOST} \
-    --host=${CYGWIN_CHOST} \
+    --build=${CHOST} \
+    --host=${CHOST} \
     --prefix=/usr \
     --with-included-libcroco \
     --with-included-libunistring \
diff --git a/git/PKGBUILD b/git/PKGBUILD
index 4357317e..c3b4d4ec 100644
--- a/git/PKGBUILD
+++ b/git/PKGBUILD
@@ -100,9 +100,8 @@ build() {
   export PYTHON_PATH='/usr/bin/python'
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib \
diff --git a/gnu-netcat/PKGBUILD b/gnu-netcat/PKGBUILD
index 229aed92..01a953b3 100644
--- a/gnu-netcat/PKGBUILD
+++ b/gnu-netcat/PKGBUILD
@@ -31,9 +31,8 @@ build() {
   cd "${srcdir}/netcat-${pkgver}"
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
   make
 }
diff --git a/gnupg/PKGBUILD b/gnupg/PKGBUILD
index b169f669..3a805cfa 100644
--- a/gnupg/PKGBUILD
+++ b/gnupg/PKGBUILD
@@ -92,9 +92,8 @@ prepare() {
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
diff --git a/gnutls/PKGBUILD b/gnutls/PKGBUILD
index b3e7f3c3..fa1a682d 100644
--- a/gnutls/PKGBUILD
+++ b/gnutls/PKGBUILD
@@ -41,9 +41,8 @@ prepare() {
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     --enable-shared \
     --enable-static \
diff --git a/gperf/PKGBUILD b/gperf/PKGBUILD
index f7de6d7d..3f4a6f62 100644
--- a/gperf/PKGBUILD
+++ b/gperf/PKGBUILD
@@ -23,9 +23,8 @@ prepare() {
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     --docdir=/usr/share/gperf/doc/
   make
diff --git a/gpgme/PKGBUILD b/gpgme/PKGBUILD
index a8da31fc..f3d0ee7e 100644
--- a/gpgme/PKGBUILD
+++ b/gpgme/PKGBUILD
@@ -46,12 +46,11 @@ prepare() {
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --disable-gpgsm-test \
     --disable-gpgconf-test \
     --disable-g13-test \
diff --git a/grep/PKGBUILD b/grep/PKGBUILD
index 697061f2..eb86ef09 100644
--- a/grep/PKGBUILD
+++ b/grep/PKGBUILD
@@ -48,9 +48,8 @@ build() {
   export gl_cv_have_weak=no
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-      --build=${CYGWIN_CHOST} \
+      --build=${CHOST} \
       --prefix=/usr \
       --without-libiconv-prefix \
       --without-libintl-prefix
diff --git a/groff/PKGBUILD b/groff/PKGBUILD
index 5c2e763d..a2db6c19 100644
--- a/groff/PKGBUILD
+++ b/groff/PKGBUILD
@@ -30,9 +30,8 @@ prepare() {
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr
   make
 }
diff --git a/gzip/PKGBUILD b/gzip/PKGBUILD
index 92f38424..913f49c3 100644
--- a/gzip/PKGBUILD
+++ b/gzip/PKGBUILD
@@ -29,9 +29,8 @@ prepare() {
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr
 
   make
diff --git a/heimdal/PKGBUILD b/heimdal/PKGBUILD
index 373a048a..273e10fb 100644
--- a/heimdal/PKGBUILD
+++ b/heimdal/PKGBUILD
@@ -62,11 +62,10 @@ prepare() {
 build() {
   cd ${srcdir}/heimdal-${pkgver}
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CYGWIN_CHOST} \
-    --host=${CYGWIN_CHOST} \
-    --target=${CYGWIN_CHOST} \
+    --build=${CHOST} \
+    --host=${CHOST} \
+    --target=${CHOST} \
     --prefix=/usr \
     --libexecdir=/usr/libexec \
     --sbindir=/usr/bin \
diff --git a/icu/PKGBUILD b/icu/PKGBUILD
index 0f7e83db..d43f2b69 100644
--- a/icu/PKGBUILD
+++ b/icu/PKGBUILD
@@ -33,13 +33,12 @@ prepare() {
 build() {
   cd ${srcdir}/icu/source
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
 
   CC=/usr/bin/gcc \
   CXX=/usr/bin/g++ \
   ./configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --sysconfdir=/etc \
     --mandir=/usr/share/man \
     --sbindir=/usr/bin
diff --git a/inetutils/PKGBUILD b/inetutils/PKGBUILD
index 990460b6..0c5ff578 100644
--- a/inetutils/PKGBUILD
+++ b/inetutils/PKGBUILD
@@ -51,9 +51,8 @@ build() {
   # this isn't set in ./configure but needed to get a valid Makefile -- don't ask me...
   export EXEEXT=.exe
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ../${pkgbase}-${pkgver}/configure --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --libexec=/usr/bin \
     --localstatedir=/var \
     --sysconfdir=/etc \
diff --git a/isl/PKGBUILD b/isl/PKGBUILD
index f8d28fe4..9fa40154 100644
--- a/isl/PKGBUILD
+++ b/isl/PKGBUILD
@@ -26,9 +26,8 @@ prepare() {
 build() {
   cd "$srcdir/${pkgbase}-${pkgver}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build="${CYGWIN_CHOST}" \
+    --build="${CHOST}" \
     --prefix=/usr \
     --enable-shared \
     --disable-static
diff --git a/jansson/PKGBUILD b/jansson/PKGBUILD
index 32433b5c..e96e9294 100644
--- a/jansson/PKGBUILD
+++ b/jansson/PKGBUILD
@@ -47,9 +47,8 @@ prepare() {
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-      --build=${CYGWIN_CHOST} \
+      --build=${CHOST} \
       --prefix=/usr \
       --enable-static=yes \
       --enable-shared=yes
diff --git a/lftp/PKGBUILD b/lftp/PKGBUILD
index f711afa6..3dfa4bcb 100644
--- a/lftp/PKGBUILD
+++ b/lftp/PKGBUILD
@@ -55,9 +55,8 @@ build() {
   [[ -d "build-${CARCH}" ]] && rm -rf "build-${CARCH}"
   mkdir -p ${srcdir}/build-${CARCH} && cd ${srcdir}/build-${CARCH}
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ../${pkgname}-${pkgver}/configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
diff --git a/libarchive/PKGBUILD b/libarchive/PKGBUILD
index 755fd7e5..73c36fa6 100644
--- a/libarchive/PKGBUILD
+++ b/libarchive/PKGBUILD
@@ -29,11 +29,10 @@ build() {
   export lt_cv_deplibs_check_method='pass_all'
   cd "${pkgname}-${pkgver}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   # Mention default options explicitly to clarify any confusion
   ./configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --enable-shared \
     --enable-static \
     --without-libiconv-prefix \
diff --git a/libargp/PKGBUILD b/libargp/PKGBUILD
index 6e1713c8..e281a1fe 100644
--- a/libargp/PKGBUILD
+++ b/libargp/PKGBUILD
@@ -38,12 +38,11 @@ build() {
   mkdir -p "${srcdir}/install-${CHOST}"
   cd "${srcdir}/build-${CHOST}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ../argp/configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
-    --host=${CYGWIN_CHOST} \
-    --target=${CYGWIN_CHOST}
+    --build=${CHOST} \
+    --host=${CHOST} \
+    --target=${CHOST}
 
   cp config.h gllib/argp-config.h
   make
diff --git a/libassuan/PKGBUILD b/libassuan/PKGBUILD
index ce7235c9..fa725271 100644
--- a/libassuan/PKGBUILD
+++ b/libassuan/PKGBUILD
@@ -36,10 +36,9 @@ prepare() {
 build() {
   cd "${pkgname}-${_oldver}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --enable-shared
 
   make no_undefined="-no-undefined"
@@ -48,10 +47,9 @@ build() {
 
   cd "${pkgname}-${pkgver}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --enable-shared \
     --enable-static
 
diff --git a/libatomic_ops/PKGBUILD b/libatomic_ops/PKGBUILD
index df6b9a46..32582182 100644
--- a/libatomic_ops/PKGBUILD
+++ b/libatomic_ops/PKGBUILD
@@ -27,11 +27,10 @@ build() {
   mkdir -p ${srcdir}/build-${CHOST} && cd ${srcdir}/build-${CHOST}
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ../${pkgbase}-${pkgver}/configure \
-    --build=${CYGWIN_CHOST} \
-    --host=${CYGWIN_CHOST} \
-    --target=${CYGWIN_CHOST} \
+    --build=${CHOST} \
+    --host=${CHOST} \
+    --target=${CHOST} \
     --prefix=/usr \
     --enable-shared \
     --enable-static
diff --git a/libbsd/PKGBUILD b/libbsd/PKGBUILD
index c2b21821..26673aff 100644
--- a/libbsd/PKGBUILD
+++ b/libbsd/PKGBUILD
@@ -30,9 +30,8 @@ prepare() {
 build() {
   cd "$pkgname-$pkgver"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build="${CYGWIN_CHOST}" \
+    --build="${CHOST}" \
     --prefix=/usr
   make
 }
diff --git a/libedit/PKGBUILD b/libedit/PKGBUILD
index e3e7cb3f..00d3a2ec 100644
--- a/libedit/PKGBUILD
+++ b/libedit/PKGBUILD
@@ -35,9 +35,8 @@ prepare() {
 build() {
   cd "${srcdir}/${pkgname}-${_snap_date}-${_base_ver}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     --enable-widec \
     CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" \
diff --git a/libgcrypt/PKGBUILD b/libgcrypt/PKGBUILD
index 08fe6b0f..c50cd766 100644
--- a/libgcrypt/PKGBUILD
+++ b/libgcrypt/PKGBUILD
@@ -33,10 +33,9 @@ prepare() {
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --enable-shared \
     --enable-static \
     --exec-prefix=/usr \
diff --git a/libgpg-error/PKGBUILD b/libgpg-error/PKGBUILD
index 87f8755e..92315c6e 100644
--- a/libgpg-error/PKGBUILD
+++ b/libgpg-error/PKGBUILD
@@ -38,10 +38,9 @@ prepare() {
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --without-libiconv-prefix \
     --without-libintl-prefix \
     --enable-install-gpg-error-config \
diff --git a/libiconv/PKGBUILD b/libiconv/PKGBUILD
index 3eb29246..9bcda4ff 100644
--- a/libiconv/PKGBUILD
+++ b/libiconv/PKGBUILD
@@ -48,10 +48,9 @@ prepare() {
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --without-libintl-prefix \
     --enable-static \
     --enable-shared \
diff --git a/libidn/PKGBUILD b/libidn/PKGBUILD
index 2c48c402..3b05757c 100644
--- a/libidn/PKGBUILD
+++ b/libidn/PKGBUILD
@@ -32,10 +32,9 @@ build() {
   cd ${srcdir}/build-${CHOST}
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ../${pkgname}-${pkgver}/configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --enable-shared \
     --enable-static
   make
diff --git a/libidn2/PKGBUILD b/libidn2/PKGBUILD
index 7608b066..9786ad9e 100644
--- a/libidn2/PKGBUILD
+++ b/libidn2/PKGBUILD
@@ -32,10 +32,9 @@ build() {
   mkdir ${srcdir}/build-${CHOST}
   cd ${srcdir}/build-${CHOST}
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ../${pkgname}-${_basever}/configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --enable-shared \
     --enable-static
   make
diff --git a/libksba/PKGBUILD b/libksba/PKGBUILD
index 59709c4d..36ff56c0 100644
--- a/libksba/PKGBUILD
+++ b/libksba/PKGBUILD
@@ -28,10 +28,9 @@ prepare() {
 build() {
   cd "$pkgname-$pkgver"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
-    --build="${CYGWIN_CHOST}" \
+    --build="${CHOST}" \
     --enable-shared \
     --disable-static
 
diff --git a/libpipeline/PKGBUILD b/libpipeline/PKGBUILD
index dc977b8f..3f99a398 100644
--- a/libpipeline/PKGBUILD
+++ b/libpipeline/PKGBUILD
@@ -25,8 +25,7 @@ build() {
   cd "${pkgname}-${pkgver}"
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
-  ./configure --build=${CYGWIN_CHOST} --prefix=/usr
+  ./configure --build=${CHOST} --prefix=/usr
   make
   make DESTDIR="${srcdir}/dest" install
 }
diff --git a/libqrencode/PKGBUILD b/libqrencode/PKGBUILD
index b9518477..d1ec458d 100644
--- a/libqrencode/PKGBUILD
+++ b/libqrencode/PKGBUILD
@@ -27,10 +27,9 @@ build() {
   mkdir -p build-${pkgbase}-${pkgver}-${CHOST}
   cd build-${pkgbase}-${pkgver}-${CHOST}
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ../${pkgbase}-${pkgver}/configure -C \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --with-tests
 
   make LDFLAGS="${LDFLAGS} -no-undefined"
diff --git a/libssh2/PKGBUILD b/libssh2/PKGBUILD
index 1abc6e30..0ed90d04 100644
--- a/libssh2/PKGBUILD
+++ b/libssh2/PKGBUILD
@@ -34,10 +34,9 @@ build() {
   cd "${pkgname}-${pkgver}"
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --enable-shared \
     --enable-static \
     --with-openssl \
diff --git a/libtasn1/PKGBUILD b/libtasn1/PKGBUILD
index fae6332b..f023d6ee 100644
--- a/libtasn1/PKGBUILD
+++ b/libtasn1/PKGBUILD
@@ -27,9 +27,8 @@ prepare() {
 build() {
   cd ${pkgname}-${pkgver}
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     --enable-shared \
     --enable-static
diff --git a/libtirpc/PKGBUILD b/libtirpc/PKGBUILD
index 884b26e8..131c828d 100644
--- a/libtirpc/PKGBUILD
+++ b/libtirpc/PKGBUILD
@@ -58,9 +58,8 @@ build() {
   export lt_cv_deplibs_check_method='pass_all'
   cd libtirpc-${pkgver}
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     --sysconfdir=/etc \
     --enable-gssapi
diff --git a/libtool/PKGBUILD b/libtool/PKGBUILD
index e486fa0c..a6ddfe85 100644
--- a/libtool/PKGBUILD
+++ b/libtool/PKGBUILD
@@ -75,9 +75,8 @@ prepare() {
 build() {
   cd "${pkgbase}-${pkgver}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     lt_cv_sys_lib_dlsearch_path_spec="/usr/lib /lib"
 
diff --git a/libunistring/PKGBUILD b/libunistring/PKGBUILD
index 3f1f096b..7212646c 100644
--- a/libunistring/PKGBUILD
+++ b/libunistring/PKGBUILD
@@ -32,9 +32,8 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   export gl_cv_have_weak=no
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr
 
   make
diff --git a/libuv/PKGBUILD b/libuv/PKGBUILD
index 23e53dc7..db4f3fd6 100644
--- a/libuv/PKGBUILD
+++ b/libuv/PKGBUILD
@@ -32,10 +32,9 @@ build() {
   export lt_cv_deplibs_check_method='pass_all'
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   cd "${srcdir}"/${pkgbase}-v${pkgver}
-  ./configure --host=${CYGWIN_CHOST} \
-              --build=${CYGWIN_CHOST} \
+  ./configure --host=${CHOST} \
+              --build=${CHOST} \
               --prefix=/usr
 
   make
diff --git a/libxcrypt/PKGBUILD b/libxcrypt/PKGBUILD
index aedc02d8..8a6150e8 100644
--- a/libxcrypt/PKGBUILD
+++ b/libxcrypt/PKGBUILD
@@ -29,11 +29,10 @@ build() {
 
   cd "${srcdir}/build-libxcrypt/"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   "${srcdir}/${pkgbase}-${pkgver}"/configure \
-    --build=${CYGWIN_CHOST} \
-    --host=${CYGWIN_CHOST} \
-    --target=${CYGWIN_CHOST} \
+    --build=${CHOST} \
+    --host=${CHOST} \
+    --target=${CHOST} \
     --prefix=/usr \
     --enable-static \
     --disable-failure-tokens \
diff --git a/libxml2/PKGBUILD b/libxml2/PKGBUILD
index d324df36..5a6c69d0 100644
--- a/libxml2/PKGBUILD
+++ b/libxml2/PKGBUILD
@@ -60,14 +60,13 @@ build() {
 
   cd ${pkgbase}-${pkgver}
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
-    --build=${CYGWIN_CHOST} \
-    --host=${CYGWIN_CHOST} \
-    --target=${CYGWIN_CHOST} \
+    --build=${CHOST} \
+    --host=${CHOST} \
+    --target=${CHOST} \
     --enable-ipv6 \
     --with-history \
     --with-iconv \
diff --git a/libxslt/PKGBUILD b/libxslt/PKGBUILD
index 47b801a2..a737ded9 100644
--- a/libxslt/PKGBUILD
+++ b/libxslt/PKGBUILD
@@ -26,11 +26,10 @@ build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
   export lt_cv_deplibs_check_method='pass_all'
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CYGWIN_CHOST} \
-    --host=${CYGWIN_CHOST} \
-    --target=${CYGWIN_CHOST} \
+    --build=${CHOST} \
+    --host=${CHOST} \
+    --target=${CHOST} \
     --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
diff --git a/libyaml/PKGBUILD b/libyaml/PKGBUILD
index 9365a48e..1e531935 100644
--- a/libyaml/PKGBUILD
+++ b/libyaml/PKGBUILD
@@ -26,9 +26,8 @@ prepare() {
 
 build() {
   cd "${srcdir}/yaml-${pkgver}"
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-     --build=${CYGWIN_CHOST} \
+     --build=${CHOST} \
      --prefix=/usr
 
   make
diff --git a/lndir/PKGBUILD b/lndir/PKGBUILD
index 07ac733d..af5c7268 100644
--- a/lndir/PKGBUILD
+++ b/lndir/PKGBUILD
@@ -19,8 +19,7 @@ build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
-  ./configure --build=${CYGWIN_CHOST} \
+  ./configure --build=${CHOST} \
               --prefix=/usr \
               --sysconfdir=/etc \
               --localstatedir=/var
diff --git a/lynx/PKGBUILD b/lynx/PKGBUILD
index 3b2973df..23ce7315 100644
--- a/lynx/PKGBUILD
+++ b/lynx/PKGBUILD
@@ -28,9 +28,8 @@ prepare() {
 build() {
   cd "${srcdir}/${pkgname}${_relver}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     --sysconfdir=/etc \
     --with-ssl=/usr \
diff --git a/lzo2/PKGBUILD b/lzo2/PKGBUILD
index 81024e7c..d9e2f5bd 100644
--- a/lzo2/PKGBUILD
+++ b/lzo2/PKGBUILD
@@ -29,10 +29,9 @@ prepare() {
 build() {
   cd "${srcdir}/lzo-${pkgver}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --enable-shared
 
   make
diff --git a/man-db/PKGBUILD b/man-db/PKGBUILD
index d7492f8c..cd959916 100644
--- a/man-db/PKGBUILD
+++ b/man-db/PKGBUILD
@@ -29,7 +29,6 @@ validpgpkeys=('AC0A4FF12611B6FCCF01C111393587D97D86500B') # Colin Watson <cjwats
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   local -a extra_config
   # 32-bit cygwin only has 32-bit time_t
   # https://github.com/msys2/MSYS2-packages/issues/4078
@@ -38,7 +37,7 @@ build() {
   fi
   ./configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --sbindir=/usr/bin \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib \
diff --git a/mc/PKGBUILD b/mc/PKGBUILD
index 4a461fc3..7c46ed81 100644
--- a/mc/PKGBUILD
+++ b/mc/PKGBUILD
@@ -62,8 +62,7 @@ prepare() {
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
-  ./configure --build=${CYGWIN_CHOST} \
+  ./configure --build=${CHOST} \
     --prefix=/usr \
     --sysconfdir=/etc \
     --without-libintl-prefix \
diff --git a/mingw-w64-cross-binutils/PKGBUILD b/mingw-w64-cross-binutils/PKGBUILD
index c5de845e..9a80b89b 100644
--- a/mingw-w64-cross-binutils/PKGBUILD
+++ b/mingw-w64-cross-binutils/PKGBUILD
@@ -59,10 +59,9 @@ _build() {
   fi
 
   MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ${srcdir}/binutils-${pkgver}/configure \
-    --build=${CYGWIN_CHOST} \
-    --host=${CYGWIN_CHOST} \
+    --build=${CHOST} \
+    --host=${CHOST} \
     --target=${_target} \
     --disable-dependency-tracking \
     --prefix=/opt \
diff --git a/mingw-w64-cross-gcc/PKGBUILD b/mingw-w64-cross-gcc/PKGBUILD
index 059b6b9e..335fe8a3 100644
--- a/mingw-w64-cross-gcc/PKGBUILD
+++ b/mingw-w64-cross-gcc/PKGBUILD
@@ -117,12 +117,11 @@ _build() {
     ;;
   esac
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
 
   ../${_realname}-${pkgver}/configure \
     --prefix=/opt \
-    --build=${CYGWIN_CHOST} \
-    --host=${CYGWIN_CHOST} \
+    --build=${CHOST} \
+    --host=${CHOST} \
     --target=${_target} \
     --libexecdir=/opt/lib \
     --disable-bootstrap \
diff --git a/mingw-w64-cross-mingwarm64-binutils/PKGBUILD b/mingw-w64-cross-mingwarm64-binutils/PKGBUILD
index e7ede853..2ffdb352 100644
--- a/mingw-w64-cross-mingwarm64-binutils/PKGBUILD
+++ b/mingw-w64-cross-mingwarm64-binutils/PKGBUILD
@@ -60,10 +60,9 @@ _build() {
   fi
 
   MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ${srcdir}/binutils/configure \
-    --build=${CYGWIN_CHOST} \
-    --host=${CYGWIN_CHOST} \
+    --build=${CHOST} \
+    --host=${CHOST} \
     --target=${_target} \
     --disable-dependency-tracking \
     --prefix=/opt \
diff --git a/mingw-w64-cross-mingwarm64-gcc/PKGBUILD b/mingw-w64-cross-mingwarm64-gcc/PKGBUILD
index 3b906c9f..7ab9d163 100644
--- a/mingw-w64-cross-mingwarm64-gcc/PKGBUILD
+++ b/mingw-w64-cross-mingwarm64-gcc/PKGBUILD
@@ -128,12 +128,11 @@ _build() {
     ;;
   esac
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
 
   ../${_realname}/configure \
     --prefix=/opt \
-    --build=${CYGWIN_CHOST} \
-    --host=${CYGWIN_CHOST} \
+    --build=${CHOST} \
+    --host=${CHOST} \
     --target=${_target} \
     --libexecdir=/opt/lib \
     --disable-bootstrap \
diff --git a/mingw-w64-cross-mingwarm64-windows-default-manifest/PKGBUILD b/mingw-w64-cross-mingwarm64-windows-default-manifest/PKGBUILD
index 38cd0df7..26c0e043 100644
--- a/mingw-w64-cross-mingwarm64-windows-default-manifest/PKGBUILD
+++ b/mingw-w64-cross-mingwarm64-windows-default-manifest/PKGBUILD
@@ -30,13 +30,12 @@ prepare() {
 _build() {
   _target=$1
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
 
   [[ -d ${srcdir}/build-${_target} ]] && rm -rf build-${_target}
   cp -rf ${srcdir}/${_realname} ${srcdir}/build-${_target}
   cd ${srcdir}/build-${_target}
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --host=${_target} \
     --prefix=/opt/${_target}
   make
diff --git a/mingw-w64-cross-windows-default-manifest/PKGBUILD b/mingw-w64-cross-windows-default-manifest/PKGBUILD
index 2b3a89fd..5fc1cecd 100644
--- a/mingw-w64-cross-windows-default-manifest/PKGBUILD
+++ b/mingw-w64-cross-windows-default-manifest/PKGBUILD
@@ -30,13 +30,12 @@ prepare() {
 _build() {
   _target=$1
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
 
   [[ -d ${srcdir}/build-${_target} ]] && rm -rf build-${_target}
   cp -rf ${srcdir}/${_realname} ${srcdir}/build-${_target}
   cd ${srcdir}/build-${_target}
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --host=${_target} \
     --prefix=/opt/${_target}
   make
diff --git a/mosh/PKGBUILD b/mosh/PKGBUILD
index 96e3b81f..6a0e7bc5 100644
--- a/mosh/PKGBUILD
+++ b/mosh/PKGBUILD
@@ -20,10 +20,9 @@ build() {
 
   CXXFLAGS+=" -D_GNU_SOURCE"
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --host=${CYGWIN_CHOST} \
-    --build=${CYGWIN_CHOST} \
+    --host=${CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     --enable-completion
   make
diff --git a/mpc/PKGBUILD b/mpc/PKGBUILD
index 6c7275ce..3d37b1bb 100644
--- a/mpc/PKGBUILD
+++ b/mpc/PKGBUILD
@@ -28,9 +28,8 @@ prepare() {
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build="${CYGWIN_CHOST}" \
+    --build="${CHOST}" \
     --prefix=/usr \
     --enable-shared \
     --disable-static
diff --git a/mpfr/PKGBUILD b/mpfr/PKGBUILD
index bdbb0063..6349d069 100644
--- a/mpfr/PKGBUILD
+++ b/mpfr/PKGBUILD
@@ -32,8 +32,7 @@ prepare() {
 build() {
   cd "${srcdir}/${pkgname}-${_pkgver}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
-  ./configure --build=${CYGWIN_CHOST} \
+  ./configure --build=${CHOST} \
     --prefix=/usr \
     --enable-shared \
     --disable-static
diff --git a/msys2-runtime-3.3/PKGBUILD b/msys2-runtime-3.3/PKGBUILD
index e207d515..a0faeb9c 100644
--- a/msys2-runtime-3.3/PKGBUILD
+++ b/msys2-runtime-3.3/PKGBUILD
@@ -278,10 +278,9 @@ build() {
 
   (cd "${srcdir}/msys2-runtime/winsup" && ./autogen.sh)
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   "${srcdir}"/msys2-runtime/configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --sysconfdir=/etc \
     "${extra_config[@]}"
   LC_ALL=C make
@@ -322,16 +321,15 @@ package_msys2-runtime() {
 }
 
 _package_msys2-runtime-devel() {
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   mkdir -p "${pkgdir}"/usr/bin
   cp -f "${srcdir}"/dest/usr/bin/msys-2.0.dbg "${pkgdir}"/usr/bin/
-  cp -rLf "${srcdir}"/dest/usr/${CYGWIN_CHOST}/include "${pkgdir}"/usr/
+  cp -rLf "${srcdir}"/dest/usr/${CHOST}/include "${pkgdir}"/usr/
   rm -f "${pkgdir}"/usr/include/iconv.h
   rm -f "${pkgdir}"/usr/include/unctrl.h
   # provided by libtirpc
   rm -fr "${pkgdir}"/usr/include/rpc/
 
-  cp -rLf "${srcdir}"/dest/usr/${CYGWIN_CHOST}/lib "${pkgdir}"/usr/
+  cp -rLf "${srcdir}"/dest/usr/${CHOST}/lib "${pkgdir}"/usr/
 }
 
 package_msys2-runtime-3.3-devel() {
diff --git a/msys2-runtime-3.4/PKGBUILD b/msys2-runtime-3.4/PKGBUILD
index 8dee8a6d..d141ac49 100644
--- a/msys2-runtime-3.4/PKGBUILD
+++ b/msys2-runtime-3.4/PKGBUILD
@@ -283,10 +283,9 @@ build() {
 
   (cd "${srcdir}/msys2-runtime/winsup" && ./autogen.sh)
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   "${srcdir}"/msys2-runtime/configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --sysconfdir=/etc \
     "${extra_config[@]}"
   LC_ALL=C make
@@ -327,14 +326,13 @@ package_msys2-runtime-3.4-devel() {
   # strip breaks the split debug info.  msys2/msys2-pacman#52
   options=('!strip')
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   mkdir -p "${pkgdir}"/usr/bin
   cp -f "${srcdir}"/dest/usr/bin/msys-2.0.dbg "${pkgdir}"/usr/bin/
-  cp -rLf "${srcdir}"/dest/usr/${CYGWIN_CHOST}/include "${pkgdir}"/usr/
+  cp -rLf "${srcdir}"/dest/usr/${CHOST}/include "${pkgdir}"/usr/
   rm -f "${pkgdir}"/usr/include/iconv.h
   rm -f "${pkgdir}"/usr/include/unctrl.h
   # provided by libtirpc
   rm -fr "${pkgdir}"/usr/include/rpc/
 
-  cp -rLf "${srcdir}"/dest/usr/${CYGWIN_CHOST}/lib "${pkgdir}"/usr/
+  cp -rLf "${srcdir}"/dest/usr/${CHOST}/lib "${pkgdir}"/usr/
 }
diff --git a/msys2-runtime-3.5/PKGBUILD b/msys2-runtime-3.5/PKGBUILD
index 32df46fd..0dc9ab72 100644
--- a/msys2-runtime-3.5/PKGBUILD
+++ b/msys2-runtime-3.5/PKGBUILD
@@ -258,11 +258,10 @@ build() {
 
   (cd "${srcdir}/msys2-runtime/winsup" && ./autogen.sh)
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   "${srcdir}"/msys2-runtime/configure \
     --with-msys2-runtime-commit="$(cat "${srcdir}/msys2-runtime.commit")" \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --sysconfdir=/etc \
     "${extra_config[@]}"
   LC_ALL=C make
@@ -303,14 +302,13 @@ package_msys2-runtime-3.5-devel() {
   # strip breaks the split debug info.  msys2/msys2-pacman#52
   options=('!strip')
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   mkdir -p "${pkgdir}"/usr/bin
   cp -f "${srcdir}"/dest/usr/bin/msys-2.0.dbg "${pkgdir}"/usr/bin/
-  cp -rLf "${srcdir}"/dest/usr/${CYGWIN_CHOST}/include "${pkgdir}"/usr/
+  cp -rLf "${srcdir}"/dest/usr/${CHOST}/include "${pkgdir}"/usr/
   rm -f "${pkgdir}"/usr/include/iconv.h
   rm -f "${pkgdir}"/usr/include/unctrl.h
   # provided by libtirpc
   rm -fr "${pkgdir}"/usr/include/rpc/
 
-  cp -rLf "${srcdir}"/dest/usr/${CYGWIN_CHOST}/lib "${pkgdir}"/usr/
+  cp -rLf "${srcdir}"/dest/usr/${CHOST}/lib "${pkgdir}"/usr/
 }
diff --git a/msys2-runtime/PKGBUILD b/msys2-runtime/PKGBUILD
index 601044be..462c1958 100644
--- a/msys2-runtime/PKGBUILD
+++ b/msys2-runtime/PKGBUILD
@@ -217,11 +217,10 @@ build() {
 
   (cd "${srcdir}/msys2-runtime/winsup" && ./autogen.sh)
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   "${srcdir}"/msys2-runtime/configure \
     --with-msys2-runtime-commit="$(cat "${srcdir}/msys2-runtime.commit")" \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --sysconfdir=/etc \
     "${extra_config[@]}"
   LC_ALL=C make
@@ -260,17 +259,16 @@ package_msys2-runtime-devel() {
   # strip breaks the split debug info.  msys2/msys2-pacman#52
   options=('!strip')
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   mkdir -p "${pkgdir}"/usr/bin
   cp -f "${srcdir}"/dest/usr/bin/msys-2.0.dbg "${pkgdir}"/usr/bin/
-  cp -rLf "${srcdir}"/dest/usr/${CYGWIN_CHOST}/include "${pkgdir}"/usr/
+  cp -rLf "${srcdir}"/dest/usr/${CHOST}/include "${pkgdir}"/usr/
   rm -f "${pkgdir}"/usr/include/iconv.h
   rm -f "${pkgdir}"/usr/include/unctrl.h
   # provided by libtirpc
   rm -fr "${pkgdir}"/usr/include/rpc/
 
-  cp -rLf "${srcdir}"/dest/usr/${CYGWIN_CHOST}/lib "${pkgdir}"/usr/
+  cp -rLf "${srcdir}"/dest/usr/${CHOST}/lib "${pkgdir}"/usr/
 
   # compatibility with Cygwin toolchains
-  cp "${srcdir}"/dest/usr/${CYGWIN_CHOST}/lib/libmsys-2.0.a "${pkgdir}"/usr/lib/libcygwin.a
+  cp "${srcdir}"/dest/usr/${CHOST}/lib/libmsys-2.0.a "${pkgdir}"/usr/lib/libcygwin.a
 }
diff --git a/nano/PKGBUILD b/nano/PKGBUILD
index 1710f5ab..0fef09c4 100644
--- a/nano/PKGBUILD
+++ b/nano/PKGBUILD
@@ -35,8 +35,7 @@ prepare() {
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
-  ./configure --build=${CYGWIN_CHOST} \
+  ./configure --build=${CHOST} \
     --prefix=/usr \
     --sysconfdir=/etc \
     --enable-color \
diff --git a/neon/PKGBUILD b/neon/PKGBUILD
index 48af7b6b..8a5870b3 100644
--- a/neon/PKGBUILD
+++ b/neon/PKGBUILD
@@ -28,8 +28,7 @@ build() {
   cd "${srcdir}"/${pkgbase}-${pkgver}
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
-  ./configure --build=${CYGWIN_CHOST} \
+  ./configure --build=${CHOST} \
     --prefix=/usr \
     --with-expat \
     --enable-shared \
diff --git a/nettle/PKGBUILD b/nettle/PKGBUILD
index f92661b8..3514defb 100644
--- a/nettle/PKGBUILD
+++ b/nettle/PKGBUILD
@@ -31,11 +31,10 @@ prepare() {
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
     --libdir=/usr/lib \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --enable-shared \
     --enable-static \
     --disable-assembler
diff --git a/nghttp2/PKGBUILD b/nghttp2/PKGBUILD
index 735373ea..200c0aea 100644
--- a/nghttp2/PKGBUILD
+++ b/nghttp2/PKGBUILD
@@ -31,10 +31,9 @@ prepare() {
 build() {
   cd nghttp2-${pkgver}
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --enable-static=yes \
     --enable-shared=yes \
     --disable-examples \
diff --git a/npth/PKGBUILD b/npth/PKGBUILD
index 40b42cc5..9d58e06c 100644
--- a/npth/PKGBUILD
+++ b/npth/PKGBUILD
@@ -32,12 +32,11 @@ prepare() {
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
-    --host=${CYGWIN_CHOST} \
-    --target=${CYGWIN_CHOST} \
+    --build=${CHOST} \
+    --host=${CHOST} \
+    --target=${CHOST} \
     --enable-shared \
     --enable-static
 
diff --git a/opensp/PKGBUILD b/opensp/PKGBUILD
index 0eb3365e..18f410f9 100644
--- a/opensp/PKGBUILD
+++ b/opensp/PKGBUILD
@@ -18,9 +18,8 @@ prepare() {
 build() {
   cd OpenSP-$pkgver
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build="${CYGWIN_CHOST}" \
+    --build="${CHOST}" \
     --prefix=/usr \
     --mandir=/usr/share/man \
     --disable-nls \
diff --git a/openssh/PKGBUILD b/openssh/PKGBUILD
index e7eb747b..31df4614 100644
--- a/openssh/PKGBUILD
+++ b/openssh/PKGBUILD
@@ -43,11 +43,10 @@ build() {
   # to work with older Cygwin versions too.
   export ac_cv_func_setproctitle=no
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   export MSYSTEM=CYGWIN
   TEST_SSH_UTF8=no \
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     --sbindir=/usr/bin \
     --libexecdir=/usr/lib/ssh \
diff --git a/patch/PKGBUILD b/patch/PKGBUILD
index ddc4cdc9..88448b95 100644
--- a/patch/PKGBUILD
+++ b/patch/PKGBUILD
@@ -42,9 +42,8 @@ build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     ac_cv_func_setmode_dos=yes
 
diff --git a/pcre/PKGBUILD b/pcre/PKGBUILD
index 6d2b84e9..b5cc550f 100644
--- a/pcre/PKGBUILD
+++ b/pcre/PKGBUILD
@@ -30,8 +30,7 @@ prepare() {
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
-  ./configure \--build=${CYGWIN_CHOST} \
+  ./configure \--build=${CHOST} \
       --prefix=/usr \
       --enable-pcre16 \
       --enable-pcre32 \
diff --git a/pcre2/PKGBUILD b/pcre2/PKGBUILD
index c34c9577..7d23ea90 100644
--- a/pcre2/PKGBUILD
+++ b/pcre2/PKGBUILD
@@ -28,9 +28,8 @@ prepare() {
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-      --build=${CYGWIN_CHOST} \
+      --build=${CHOST} \
       --prefix=/usr \
       --disable-jit \
       --enable-pcre2-8 \
diff --git a/pinentry/PKGBUILD b/pinentry/PKGBUILD
index 41cef376..adcd6fd6 100644
--- a/pinentry/PKGBUILD
+++ b/pinentry/PKGBUILD
@@ -31,9 +31,8 @@ prepare() {
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     --disable-pinentry-tty \
     --disable-fallback-curses \
diff --git a/pkgconf/PKGBUILD b/pkgconf/PKGBUILD
index ebc426f3..dd81f9bb 100644
--- a/pkgconf/PKGBUILD
+++ b/pkgconf/PKGBUILD
@@ -41,7 +41,6 @@ package() {
 
   DESTDIR="$pkgdir" meson install
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
-  cp "$pkgdir"/usr/bin/pkgconf "$pkgdir/usr/bin/${CYGWIN_CHOST}-pkg-config"
+  cp "$pkgdir"/usr/bin/pkgconf "$pkgdir/usr/bin/${CHOST}-pkg-config"
   cp "$pkgdir"/usr/bin/pkgconf "$pkgdir"/usr/bin/pkg-config
 }
diff --git a/procps-ng/PKGBUILD b/procps-ng/PKGBUILD
index a5141ab1..d9e866aa 100644
--- a/procps-ng/PKGBUILD
+++ b/procps-ng/PKGBUILD
@@ -49,9 +49,8 @@ prepare() {
 build() {
   cd ${srcdir}/procps-ng-${pkgver}
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     --bindir=/usr/bin \
     --sbindir=/usr/bin \
diff --git a/python/PKGBUILD b/python/PKGBUILD
index 78f3db60..8db203fe 100644
--- a/python/PKGBUILD
+++ b/python/PKGBUILD
@@ -98,11 +98,10 @@ build() {
   cd "${srcdir}/Python-${pkgver}"
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
-    --host=${CYGWIN_CHOST} \
+    --build=${CHOST} \
+    --host=${CHOST} \
     --enable-shared \
     --enable-ipv6 \
     --with-dbmliborder=gdbm \
diff --git a/rcs/PKGBUILD b/rcs/PKGBUILD
index 02e2f6a7..c17f442a 100644
--- a/rcs/PKGBUILD
+++ b/rcs/PKGBUILD
@@ -27,10 +27,9 @@ prepare() {
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
   --prefix=/usr \
-  --build=${CYGWIN_CHOST}
+  --build=${CHOST}
 
   make
 }
diff --git a/readline/PKGBUILD b/readline/PKGBUILD
index 1995759d..733430a4 100644
--- a/readline/PKGBUILD
+++ b/readline/PKGBUILD
@@ -76,14 +76,14 @@ prepare() {
 }
 
 build() {
-  local CYGWIN_CHOST="$(echo "${CHOST}" | sed 's|-msys$|-cygwin|')"
+  local CHOST="$(echo "${CHOST}" | sed 's|-msys$|-cygwin|')"
 
   mkdir -p ${srcdir}/build-static-${MSYSTEM} && cd ${srcdir}/build-static-${MSYSTEM}
 
   ../${pkgbase}-${_basever}/configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
-    --host=${CYGWIN_CHOST} \
+    --build=${CHOST} \
+    --host=${CHOST} \
     --with-curses \
     --disable-shared \
     --enable-static \
@@ -98,8 +98,8 @@ build() {
 
   ../${pkgbase}-${_basever}/configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
-    --host=${CYGWIN_CHOST} \
+    --build=${CHOST} \
+    --host=${CHOST} \
     --with-curses \
     --disable-static \
     --enable-shared \
diff --git a/rebase/PKGBUILD b/rebase/PKGBUILD
index 9183136c..acaa9064 100644
--- a/rebase/PKGBUILD
+++ b/rebase/PKGBUILD
@@ -49,8 +49,7 @@ prepare() {
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
-  ./configure --build=${CYGWIN_CHOST} --prefix=/usr \
+  ./configure --build=${CHOST} --prefix=/usr \
     --sysconfdir=/etc \
     --with-posix-shell=/usr/bin/dash \
     CXXFLAGS="${CXXFLAGS} -static -static-libgcc -static-libstdc++" \
diff --git a/remake/PKGBUILD b/remake/PKGBUILD
index 9aed8f51..f1255ce8 100644
--- a/remake/PKGBUILD
+++ b/remake/PKGBUILD
@@ -31,10 +31,9 @@ prepare() {
 build() {
   cd ${srcdir}/${pkgname}-4.3+${_remakever}
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --without-libintl-prefix \
     --without-libiconv-prefix \
     ac_cv_dos_paths=yes
diff --git a/rpcsvc-proto/PKGBUILD b/rpcsvc-proto/PKGBUILD
index 8337bf73..a4ed1569 100644
--- a/rpcsvc-proto/PKGBUILD
+++ b/rpcsvc-proto/PKGBUILD
@@ -28,12 +28,11 @@ build() {
   [[ -d "${srcdir}/build-${MSYSTEM_CHOST}" ]] && rm -rf "${srcdir}/build-${MSYSTEM_CHOST}"
   mkdir -p "${srcdir}/build-${MSYSTEM_CHOST}" && cd "${srcdir}/build-${MSYSTEM_CHOST}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ../${pkgname}-${pkgver}/configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
-    --host=${CYGWIN_CHOST} \
-    --target=${CYGWIN_CHOST}
+    --build=${CHOST} \
+    --host=${CHOST} \
+    --target=${CHOST}
 
   make
 }
diff --git a/rsync/PKGBUILD b/rsync/PKGBUILD
index 62b4c34b..138b3aef 100644
--- a/rsync/PKGBUILD
+++ b/rsync/PKGBUILD
@@ -33,9 +33,8 @@ prepare() {
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-      --build=${CYGWIN_CHOST} \
+      --build=${CHOST} \
       --prefix=/usr
   
   make reconfigure
diff --git a/ruby/PKGBUILD b/ruby/PKGBUILD
index 4ecf616c..9c6ec4db 100644
--- a/ruby/PKGBUILD
+++ b/ruby/PKGBUILD
@@ -73,11 +73,10 @@ build() {
   mkdir -p ${srcdir}/build-${CHOST} && cd ${srcdir}/build-${CHOST}
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   CFLAGS+=" -fno-strict-aliasing "
   CXXFLAGS+=" -fno-strict-aliasing "
   ../ruby-${pkgver//_/-}/configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     --exec_prefix=/usr \
     --sysconfdir=/etc \
diff --git a/sed/PKGBUILD b/sed/PKGBUILD
index f35b5dc4..249bd22d 100644
--- a/sed/PKGBUILD
+++ b/sed/PKGBUILD
@@ -36,10 +36,9 @@ build() {
 
   export gl_cv_have_weak=no
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST}
+    --build=${CHOST}
   make all html
 }
 
diff --git a/sqlite/PKGBUILD b/sqlite/PKGBUILD
index 09d5cfcd..009c896e 100644
--- a/sqlite/PKGBUILD
+++ b/sqlite/PKGBUILD
@@ -81,7 +81,6 @@ build() {
 "
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
 
   mkdir -p build-${_srcver}-${MSYSTEM_CHOST}
   cd build-${_srcver}-${MSYSTEM_CHOST}
@@ -89,7 +88,7 @@ build() {
     --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --enable-shared \
     --enable-static \
     --enable-readline \
diff --git a/subversion/PKGBUILD b/subversion/PKGBUILD
index 3bcdb724..0b674510 100644
--- a/subversion/PKGBUILD
+++ b/subversion/PKGBUILD
@@ -125,9 +125,8 @@ build() {
   cd ${pkgname}-${pkgver}
   export PYTHON=/usr/bin/python
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure --prefix=/usr \
-      --build=${CYGWIN_CHOST} \
+      --build=${CHOST} \
       --with-apr=/usr \
       --with-apr-util=/usr \
       --with-zlib=/usr \
diff --git a/swig/PKGBUILD b/swig/PKGBUILD
index 5230bb31..c7a993cf 100644
--- a/swig/PKGBUILD
+++ b/swig/PKGBUILD
@@ -29,8 +29,7 @@ build() {
   cd ${pkgname}-${pkgver}
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
-  ./configure -build=${CYGWIN_CHOST} --prefix=/usr
+  ./configure -build=${CHOST} --prefix=/usr
   make
 }
 
diff --git a/tar/PKGBUILD b/tar/PKGBUILD
index ea9c6fbd..5df06deb 100644
--- a/tar/PKGBUILD
+++ b/tar/PKGBUILD
@@ -40,7 +40,6 @@ build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   export gl_cv_have_weak=no
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   local -a extra_config
   # 32-bit cygwin only has 32-bit time_t
   # https://github.com/msys2/MSYS2-packages/issues/4078
@@ -48,7 +47,7 @@ build() {
     extra_config+=("--disable-year2038")
   fi
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     --sbindir=/usr/bin \
     --libexecdir=/usr/lib/tar \
diff --git a/tcl/PKGBUILD b/tcl/PKGBUILD
index b7f73a99..883e4ad8 100644
--- a/tcl/PKGBUILD
+++ b/tcl/PKGBUILD
@@ -42,11 +42,10 @@ build() {
   cd tcl${pkgver}/unix
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   local BIT=
   [[ $CARCH == "x86_64" ]] && BIT="--enable-64bit"
   ./configure \
-    --build="${CYGWIN_CHOST}" \
+    --build="${CHOST}" \
     --prefix=/usr \
     --mandir=/usr/share/man \
     --enable-threads \
diff --git a/tcsh/PKGBUILD b/tcsh/PKGBUILD
index 0bb44385..63ada90f 100644
--- a/tcsh/PKGBUILD
+++ b/tcsh/PKGBUILD
@@ -33,12 +33,11 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
-    --host=${CYGWIN_CHOST} \
-    --target=${CYGWIN_CHOST}
+    --build=${CHOST} \
+    --host=${CHOST} \
+    --target=${CHOST}
 
   make
 }
diff --git a/texinfo/PKGBUILD b/texinfo/PKGBUILD
index e59a0f22..cbf6893d 100644
--- a/texinfo/PKGBUILD
+++ b/texinfo/PKGBUILD
@@ -47,9 +47,8 @@ build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     --without-libiconv-prefix \
     --without-libintl-prefix \
diff --git a/tftp-hpa/PKGBUILD b/tftp-hpa/PKGBUILD
index c08dfe13..2177c2ef 100644
--- a/tftp-hpa/PKGBUILD
+++ b/tftp-hpa/PKGBUILD
@@ -65,9 +65,8 @@ build() {
 
   CFLAGS+=" -fcommon"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure --prefix=/usr \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --mandir=/usr/share/man \
     --sbindir=/usr/bin \
     --without-tcpwrappers \
diff --git a/time/PKGBUILD b/time/PKGBUILD
index b9c04156..4e19c9b7 100644
--- a/time/PKGBUILD
+++ b/time/PKGBUILD
@@ -23,11 +23,10 @@ prepare() {
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
     --infodir=/usr/share/info \
-    --build=${CYGWIN_CHOST}
+    --build=${CHOST}
   make
 }
 
diff --git a/tmate/PKGBUILD b/tmate/PKGBUILD
index 744525d3..3017aa22 100644
--- a/tmate/PKGBUILD
+++ b/tmate/PKGBUILD
@@ -38,9 +38,8 @@ prepare() {
 build() {
   cd ${srcdir}/$pkgname
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
diff --git a/tmux/PKGBUILD b/tmux/PKGBUILD
index 7a2dfdcd..35e97458 100644
--- a/tmux/PKGBUILD
+++ b/tmux/PKGBUILD
@@ -39,9 +39,8 @@ prepare() {
 build() {
   cd "${srcdir}/${pkgname}-${_base_ver}${_bugfix/./}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --enable-sixel \
     --prefix=/usr \
     --sysconfdir=/etc \
diff --git a/ucl/PKGBUILD b/ucl/PKGBUILD
index 15becdf6..ff8c05f3 100644
--- a/ucl/PKGBUILD
+++ b/ucl/PKGBUILD
@@ -41,10 +41,9 @@ prepare() {
 build() {
   cd "${_realname}-${pkgver}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   CPPFLAGS="$CPPFLAGS -std=c90 -fPIC" \
   ./configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     --enable-shared \
     --enable-static \
diff --git a/util-linux/PKGBUILD b/util-linux/PKGBUILD
index 7ab8687e..458c7692 100644
--- a/util-linux/PKGBUILD
+++ b/util-linux/PKGBUILD
@@ -87,7 +87,6 @@ build() {
   CPPFLAGS+=" -D__USE_LINUX_IOCTL_DEFS"
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   local -a extra_config
   # 32-bit cygwin only has 32-bit time_t
   # https://github.com/msys2/MSYS2-packages/issues/4078
@@ -97,7 +96,7 @@ build() {
     extra_config+=("--disable-year2038" "--disable-fallocate")
   fi
   ../${pkgname}-${pkgver}/configure \
-    --build=${CYGWIN_CHOST} \
+    --build=${CHOST} \
     --prefix=/usr \
     --bindir=/usr/bin \
     --sbindir=/usr/bin \
diff --git a/wget/PKGBUILD b/wget/PKGBUILD
index 46f49dd6..17e1003d 100644
--- a/wget/PKGBUILD
+++ b/wget/PKGBUILD
@@ -37,8 +37,7 @@ EOF
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
-  ./configure --build=${CYGWIN_CHOST} \
+  ./configure --build=${CHOST} \
     --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
diff --git a/windows-default-manifest/PKGBUILD b/windows-default-manifest/PKGBUILD
index 2b1ec690..3851faee 100644
--- a/windows-default-manifest/PKGBUILD
+++ b/windows-default-manifest/PKGBUILD
@@ -21,10 +21,9 @@ prepare() {
 
 build() {
   cd ${srcdir}/${pkgname}
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
-    --build=${CYGWIN_CHOST}
+    --build=${CHOST}
   make
 }
 
diff --git a/xorriso/PKGBUILD b/xorriso/PKGBUILD
index e0631356..37e20958 100644
--- a/xorriso/PKGBUILD
+++ b/xorriso/PKGBUILD
@@ -27,10 +27,9 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --host="${CYGWIN_CHOST}" \
-    --build="${CYGWIN_CHOST}" \
+    --host="${CHOST}" \
+    --build="${CHOST}" \
     --prefix=/usr \
     --enable-shared \
     --disable-static
diff --git a/xz/PKGBUILD b/xz/PKGBUILD
index d150a10d..e8825d98 100644
--- a/xz/PKGBUILD
+++ b/xz/PKGBUILD
@@ -30,7 +30,6 @@ build() {
 
   export lt_cv_deplibs_check_method='pass_all'
   export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --build=${CHOST} \
     --prefix=/usr \
diff --git a/yasm/PKGBUILD b/yasm/PKGBUILD
index 507304aa..3e949324 100644
--- a/yasm/PKGBUILD
+++ b/yasm/PKGBUILD
@@ -33,10 +33,9 @@ prepare() {
 
 build() {
   cd ${pkgname}-${pkgver}
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
-    --build="${CYGWIN_CHOST}"
+    --build="${CHOST}"
   make
   make DESTDIR="${srcdir}/dest" install
 }
diff --git a/zlib/PKGBUILD b/zlib/PKGBUILD
index 76245d86..8fbf46f7 100644
--- a/zlib/PKGBUILD
+++ b/zlib/PKGBUILD
@@ -38,7 +38,6 @@ build() {
 
   # configure doesn't really work.. but leave it here in case things improve
   export MSYSTEM=CYGWIN
-  export CHOST="${CHOST/-msys/-cygwin}"
   ./configure --prefix=/usr
 
   # Instead we use some "other" makefile