From c9c63806a7a068cbc4d12d5739fdd0b05742241d Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 25 Aug 2020 19:04:42 +1000
Subject: [PATCH] MSYS2: install packages for AVR toolchain (#10078)

---
 util/activate_msys2.sh |  1 -
 util/msys2_install.sh  | 33 +++++----------------------------
 2 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/util/activate_msys2.sh b/util/activate_msys2.sh
index b003c1a7873..3fc149dbb65 100755
--- a/util/activate_msys2.sh
+++ b/util/activate_msys2.sh
@@ -3,7 +3,6 @@
 function export_variables {
     local util_dir=~/qmk_utils
     export PATH=$PATH:$util_dir
-    export PATH=$PATH:$util_dir/avr8-gnu-toolchain/bin
     export PATH=$PATH:$util_dir/gcc-arm-none-eabi/bin
 }
 
diff --git a/util/msys2_install.sh b/util/msys2_install.sh
index 1351aa5d733..b92199647df 100755
--- a/util/msys2_install.sh
+++ b/util/msys2_install.sh
@@ -2,25 +2,18 @@
 
 dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
 download_dir=~/qmk_utils
-avrtools=avr8-gnu-toolchain
 armtools=gcc-arm-none-eabi
 util_dir=$(dirname "$0")
 
-echo "Installing dependencies needed for the installation (quazip)"
+echo "Installing dependencies needed for the installation"
 pacman --needed --noconfirm --disable-download-timeout -Sy base-devel mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang git mingw-w64-x86_64-python3-pip unzip
 
 source "$dir/win_shared_install.sh"
 
 function install_avr {
-    rm -f -r "$avrtools"
-    wget "https://blog.zakkemble.net/download/avr-gcc-8.3.0-x86-mingw.zip"
-    echo "Extracting AVR toolchain..."
-    unzip -q -d . avr-gcc-8.3.0-x86-mingw.zip
-    mv avr-gcc-8.3.0-x86-mingw avr8-gnu-toolchain
-    rm avr8-gnu-toolchain/bin/make.exe
-    rm avr-gcc-8.3.0-x86-mingw.zip
-
-    pacman --needed --noconfirm --disable-download-timeout -S mingw-w64-x86_64-avrdude mingw-w64-x86_64-bootloadhid mingw-w64-x86_64-dfu-programmer mingw-w64-x86_64-teensy-loader-cli
+    pacman --needed --noconfirm --disable-download-timeout -S \
+        mingw-w64-x86_64-avr-binutils mingw-w64-x86_64-avr-gcc mingw-w64-x86_64-avr-libc \
+        mingw-w64-x86_64-avrdude mingw-w64-x86_64-bootloadhid mingw-w64-x86_64-dfu-programmer mingw-w64-x86_64-teensy-loader-cli
 }
 
 function install_arm {
@@ -35,23 +28,7 @@ function install_arm {
 
 pushd "$download_dir"
 
-if [ ! -d "$avrtools" ]; then
-    echo
-    echo "The AVR toolchain is not installed."
-    echo "This is needed for building AVR based keyboards."
-    install_avr
-else
-    while true; do
-        echo
-        echo "The AVR toolchain is already installed"
-        read -p "Do you want to reinstall? (Y/N) " res
-        case $res in
-            [Yy]* ) install_avr; break;;
-            [Nn]* ) break;;
-            * ) echo "Invalid answer";;
-        esac
-    done
-fi
+install_avr
 
 if [ ! -d "$armtools" ]; then
     echo