[incubator-nuttx-testing] 01/01: cibuild.sh: Workaround conflict with x86_64-elf-binutils after avr-gcc version bump

[gu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gustavonihei pushed a commit to branch bugfix/avr_gcc_rollback
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-testing.git

commit 730ab474e46050fd81bcc5f41518db40b181f493
Author: Gustavo Henrique Nihei <gu...@espressif.com>
AuthorDate: Fri Jun 4 21:14:01 2021 -0300

    cibuild.sh: Workaround conflict with x86_64-elf-binutils after avr-gcc
    version bump
---
 cibuild.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/cibuild.sh b/cibuild.sh
index ea47d87..4ed4315 100755
--- a/cibuild.sh
+++ b/cibuild.sh
@@ -227,7 +227,12 @@ function avr-gcc-toolchain {
     case $os in
       Darwin)
         brew tap osx-cross/avr
-        brew install avr-gcc
+        # Rolling back avr-gcc version as a temporary workaround to conflict between
+        # x86_64-elf-binutils-2.36.1 and avr-binutils-2.36.1
+        pushd $(brew --repository)/Library/Taps/osx-cross/homebrew-avr &>/dev/null
+        git checkout c1a94c9
+        popd &>/dev/null
+        HOMEBREW_NO_AUTO_UPDATE=1 brew install avr-gcc
         ;;
     esac
   fi