aboutsummaryrefslogtreecommitdiffstats
path: root/dist/msys2-mingw/run.sh
diff options
context:
space:
mode:
Diffstat (limited to 'dist/msys2-mingw/run.sh')
-rw-r--r--dist/msys2-mingw/run.sh8
1 files changed, 3 insertions, 5 deletions
diff --git a/dist/msys2-mingw/run.sh b/dist/msys2-mingw/run.sh
index 55aff45c4..186520b05 100644
--- a/dist/msys2-mingw/run.sh
+++ b/dist/msys2-mingw/run.sh
@@ -72,13 +72,11 @@ cd "$TARGET"
# But the following command fails if the repository is complete.
gblock "Fetch --unshallow" git fetch --unshallow || true
-MINGW_INSTALLS="$(echo "$MINGW_INSTALLS" | tr '[:upper:]' '[:lower:]')"
-
case "$MINGW_INSTALLS" in
- mingw32)
+ *32)
TARBALL_ARCH="i686"
;;
- mingw64)
+ *64)
TARBALL_ARCH="x86_64"
;;
*)
@@ -86,7 +84,7 @@ case "$MINGW_INSTALLS" in
exit 1
esac
-gblock 'Install toolchain' pacman -S --noconfirm base-devel mingw-w64-${TARBALL_ARCH}-toolchain
+gblock 'Install toolchain' pacman -S --noconfirm --needed base-devel mingw-w64-${TARBALL_ARCH}-toolchain
gblock 'Build package' makepkg-mingw --noconfirm --noprogressbar -sCLf --noarchive
gblock 'Archive package' makepkg-mingw --noconfirm --noprogressbar -R
gblock 'List artifacts' ls -la