Void Linux: Switch to cross-arm-none-eabi toolchain (#9228)

1 files changed, 3 insertions, 9 deletions

diff --git a/util/linux_install.sh b/util/linux_install.sh
index d30f78655..43044f85c 100755
--- a/util/linux_install.sh
+++ b/util/linux_install.sh
@@ -208,19 +208,13 @@ elif grep ID /etc/os-release | grep -q solus; then
         printf "\n$SOLUS_INFO\n"
 
 elif grep ID /etc/os-release | grep -q void; then
-        # musl Void systems don't have glibc cross compilers avaliable in their repos.
-        # glibc Void systems do have musl cross compilers though, for some reason.
-        # So, default to musl, and switch to glibc if it is installed.
-        CROSS_ARM=cross-arm-linux-musleabi
-        if xbps-query glibc > /dev/null; then # Check is glibc if installed
-                CROSS_ARM=cross-arm-linux-gnueabi
-        fi
-
         sudo xbps-install \
                 avr-binutils \
                 avr-gcc \
                 avr-libc \
-                $CROSS_ARM \
+                cross-arm-none-eabi-binutils \
+                cross-arm-none-eabi-gcc \
+                cross-arm-none-eabi-newlib \
                 avrdude \
                 dfu-programmer \
                 dfu-util \