diff options
| author | Ryan <fauxpark@gmail.com> | 2020-06-02 18:53:38 +1000 |
|---|---|---|
| committer | Drashna Jael're <drashna@live.com> | 2020-08-08 20:56:52 -0700 |
| commit | 1cf68dffd4861d19579c21c92e625f4e875e2146 (patch) | |
| tree | 748f424694d4d7b097b529a52c8012640a145b1b /util/linux_install.sh | |
| parent | 3390de355176417c27a678caeb87d28de3889577 (diff) | |
Void Linux: Switch to cross-arm-none-eabi toolchain (#9228)
Diffstat (limited to 'util/linux_install.sh')
| -rwxr-xr-x | util/linux_install.sh | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/util/linux_install.sh b/util/linux_install.sh index bac631f326..bd587c36d1 100755 --- a/util/linux_install.sh +++ b/util/linux_install.sh @@ -202,19 +202,14 @@ 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 \ gcc \ |