diff options
| author | Ryan <fauxpark@gmail.com> | 2020-06-02 18:53:38 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-02 18:53:38 +1000 |
| commit | c73125eea7b482724635a2ac2e1c006a8fddfdad (patch) | |
| tree | 20935c27e60a3869fcbea079aeb72f3c034f1334 | |
| parent | 306d02aa9328630ca97a8b8863286986dba85603 (diff) | |
Void Linux: Switch to cross-arm-none-eabi toolchain (#9228)0.9.5
| -rwxr-xr-x | util/linux_install.sh | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/util/linux_install.sh b/util/linux_install.sh index d30f786558..43044f85cb 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 \ |