diff options
| author | eine <eine@users.noreply.github.com> | 2020-07-22 02:37:10 +0200 |
|---|---|---|
| committer | eine <eine@users.noreply.github.com> | 2020-07-24 14:44:46 +0200 |
| commit | 541f64a647587f85373b197609a1f768ea1c847b (patch) | |
| tree | 5f250281c17a37561fc211311babc061e42a67fb /dist/msys2-mingw | |
| parent | a1ea7f484c6efb76fcedda444c243fd04f4e7cfa (diff) | |
| download | ghdl-541f64a647587f85373b197609a1f768ea1c847b.tar.gz ghdl-541f64a647587f85373b197609a1f768ea1c847b.tar.bz2 ghdl-541f64a647587f85373b197609a1f768ea1c847b.zip | |
ci(msys2): eine/setup-msys2 was transferred to msys2/setup-msys2, bump to v2
Diffstat (limited to 'dist/msys2-mingw')
| -rw-r--r-- | dist/msys2-mingw/run.sh | 8 |
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 |