diff --git a/bison/PKGBUILD b/bison/PKGBUILD
index d9d856ba..1934aacf 100644
--- a/bison/PKGBUILD
+++ b/bison/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=bison
 pkgver=3.8.2
-pkgrel=2
+pkgrel=3
 pkgdesc="The GNU general-purpose parser generator"
 arch=('i686' 'x86_64')
 license=('spdx:GPL-3.0-or-later')
@@ -29,10 +29,10 @@ prepare() {
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  CHOST="${CHOST/-msys/-cygwin}" \
-    ./configure \
-      --build=${CHOST} \
-      --prefix=/usr
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
+  ./configure \
+    --build=${CYGWIN_CHOST} \
+    --prefix=/usr
   make
 }
 
diff --git a/diffutils/PKGBUILD b/diffutils/PKGBUILD
index 20fb32d5..be4cab63 100644
--- a/diffutils/PKGBUILD
+++ b/diffutils/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=diffutils
 pkgver=3.8
-pkgrel=2
+pkgrel=3
 pkgdesc="Utility programs used for creating patch files"
 arch=('i686' 'x86_64')
 url="https://www.gnu.org/software/diffutils"
@@ -31,9 +31,9 @@ build() {
   # make sure tests are running OK
   sed -i "s/mkdir -m 0700/mkdir /" tests/init.sh
 
-  CHOST="${CHOST/-msys/-cygwin}" \
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CHOST} \
+    --build=${CYGWIN_CHOST} \
     --prefix=/usr \
     --without-libiconv-prefix \
     --without-libintl-prefix
diff --git a/ed/PKGBUILD b/ed/PKGBUILD
index edb02d9f..4854364d 100644
--- a/ed/PKGBUILD
+++ b/ed/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=ed
 pkgver=1.18
-pkgrel=1
+pkgrel=2
 pkgdesc="A POSIX-compliant line-oriented text editor"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -18,9 +18,9 @@ validpgpkeys=('1D41C14B272A2219A739FA4F8FE99503132D7742') # Antonio Diaz Diaz <a
 build() {
   cd "$pkgname-$pkgver"
 
-  CHOST="${CHOST/-msys/-cygwin}" \
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure --prefix=/ \
-              --build=${CHOST} \
+              --build=${CYGWIN_CHOST} \
               --bindir=/usr/bin \
               --mandir=/usr/share/man \
               --infodir=/usr/share/info \
diff --git a/file/PKGBUILD b/file/PKGBUILD
index 2e80e437..f6983184 100644
--- a/file/PKGBUILD
+++ b/file/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=file
 pkgver=5.41
-pkgrel=2
+pkgrel=3
 pkgdesc="File type identification utility"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -25,12 +25,12 @@ prepare() {
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  CHOST="${CHOST/-msys/-cygwin}" \
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
-    --build=${CHOST} \
-    --host=${CHOST} \
-    --target=${CHOST} \
+    --build=${CYGWIN_CHOST} \
+    --host=${CYGWIN_CHOST} \
+    --target=${CYGWIN_CHOST} \
     --enable-fsect-man5
 
   make
diff --git a/gnutls/PKGBUILD b/gnutls/PKGBUILD
index e33fb6d6..7d61a433 100644
--- a/gnutls/PKGBUILD
+++ b/gnutls/PKGBUILD
@@ -4,7 +4,7 @@ pkgbase=gnutls
 pkgname=('gnutls' 'libgnutls' 'libgnutls-devel')
 _base_ver=3.7.4
 pkgver=${_base_ver}
-pkgrel=1
+pkgrel=2
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('x86_64' 'i686')
 license=('GPL3' 'LGPL2.1')
@@ -41,9 +41,9 @@ prepare() {
 build() {
   cd "${srcdir}/${pkgname}-${_base_ver}"
 
-  CHOST="${CHOST/-msys/-cygwin}" \
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CHOST} \
+    --build=${CYGWIN_CHOST} \
     --prefix=/usr \
     --enable-shared \
     --enable-static \
diff --git a/gperf/PKGBUILD b/gperf/PKGBUILD
index dd79c3a9..5f385069 100644
--- a/gperf/PKGBUILD
+++ b/gperf/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=gperf
 pkgver=3.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Perfect hash function generator"
 arch=('x86_64' 'i686')
 url="https://www.gnu.org/software/gperf/"
@@ -24,9 +24,9 @@ prepare() {
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
 
-  CHOST="${CHOST/-msys/-cygwin}" \
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CHOST} \
+    --build=${CYGWIN_CHOST} \
     --prefix=/usr \
     --docdir=/usr/share/gperf/doc/
   make
diff --git a/gpgme/PKGBUILD b/gpgme/PKGBUILD
index c7e5c360..4c9cde03 100644
--- a/gpgme/PKGBUILD
+++ b/gpgme/PKGBUILD
@@ -3,7 +3,7 @@
 pkgbase=gpgme
 pkgname=('libgpgme' 'libgpgme-devel' 'libgpgme-python')
 pkgver=1.17.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A C wrapper library for GnuPG"
 arch=('i686' 'x86_64')
 url="https://gnupg.org/related_software/gpgme/"
@@ -29,12 +29,12 @@ prepare() {
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
 
-  CHOST="${CHOST/-msys/-cygwin}" \
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
-    --build=${CHOST} \
+    --build=${CYGWIN_CHOST} \
     --disable-gpgsm-test \
     --disable-gpgconf-test \
     --disable-g13-test \
diff --git a/groff/PKGBUILD b/groff/PKGBUILD
index 2746b92e..d92337c4 100644
--- a/groff/PKGBUILD
+++ b/groff/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=groff
 pkgver=1.22.4
-pkgrel=2
+pkgrel=3
 pkgdesc="GNU troff text-formatting system"
 arch=('i686' 'x86_64')
 url="https://www.gnu.org/software/groff/groff.html"
@@ -28,9 +28,9 @@ prepare() {
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  CHOST="${CHOST/-msys/-cygwin}" \
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CHOST} \
+    --build=${CYGWIN_CHOST} \
     --prefix=/usr
   make
 }
diff --git a/libarchive/PKGBUILD b/libarchive/PKGBUILD
index 3efd9c45..3ea6213a 100644
--- a/libarchive/PKGBUILD
+++ b/libarchive/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=('libarchive' 'libarchive-devel' 'bsdcpio' 'bsdtar')
 pkgver=3.5.3
-pkgrel=1
+pkgrel=2
 pkgdesc="library that can create and read several streaming archive formats"
 arch=('i686' 'x86_64')
 url="https://libarchive.org/"
@@ -29,9 +29,10 @@ build() {
   export lt_cv_deplibs_check_method='pass_all'
   cd "${pkgname}-${pkgver}"
 
-  CHOST="${CHOST/-msys/-cygwin}" \
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
+    --build=${CYGWIN_CHOST} \
     --enable-shared \
     --enable-static \
     --without-libiconv-prefix \