diff --git a/mingw-w64-gnustep-base/PKGBUILD b/mingw-w64-gnustep-base/PKGBUILD
index 4d26035cbede2..99a3f383be832 100644
--- a/mingw-w64-gnustep-base/PKGBUILD
+++ b/mingw-w64-gnustep-base/PKGBUILD
@@ -4,10 +4,10 @@ _realname=gnustep-base
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=1.30.0
-pkgrel=8
+pkgrel=9
 pkgdesc="GNUstep Base library (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64')
 url='https://gnustep.github.org/'
 license=('spdx:LGPL-2.1-or-later')
 makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
@@ -44,22 +44,11 @@ build() {
   rsync --recursive --times --links "${srcdir}/${_realname}-${pkgver}"/* "${srcdir}/build-${MSYSTEM}"
   cd "${srcdir}/build-${MSYSTEM}"
 
-  case ${MSYSTEM} in
-    MINGW*|UCRT*)
-      export LDFLAGS="-fuse-ld=lld -lstdc++ -lgcc_s"
-      ;;
-    CLANG*)
-      export LDFLAGS="-lc++"
-      ;;
-  esac
-
   CC="$MINGW_PREFIX/bin/clang" \
   CXX="$MINGW_PREFIX/bin/clang++" \
   ./configure \
     --prefix="${MINGW_PREFIX}"
-  
-  CC="$MINGW_PREFIX/bin/clang" \
-  CXX="$MINGW_PREFIX/bin/clang++" \
+
   make
 }
 
diff --git a/mingw-w64-gnustep-make/PKGBUILD b/mingw-w64-gnustep-make/PKGBUILD
index 67547c26cb32f..41c537a524eb4 100644
--- a/mingw-w64-gnustep-make/PKGBUILD
+++ b/mingw-w64-gnustep-make/PKGBUILD
@@ -4,7 +4,7 @@ _realname=gnustep-make
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=2.9.2
-pkgrel=1
+pkgrel=2
 pkgdesc="GNUstep build system (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64')
@@ -25,12 +25,13 @@ build() {
   cd "${srcdir}/${_realname}-${pkgver}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
+  # libobjc2 defers exception handling to the C++ library, so link with a C++ library
   case ${MSYSTEM} in
     MINGW*|UCRT*)
       export LDFLAGS="-fuse-ld=lld -lstdc++ -lgcc_s"
       ;;
     CLANG*)
-      export LDFLAGS="-lc++"
+      export LDFLAGS="-Wl,--no-whole-archive -lc++"
       ;;
   esac