[incubator-nuttx] branch master updated: tools/ci: Revert workaround for issue with avr-binutils

[ma...@apache.org]

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

masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 817d81d  tools/ci: Revert workaround for issue with avr-binutils
817d81d is described below

commit 817d81d38ffcf4bdc13ccf4eb6edabe17c9b19c3
Author: Gustavo Henrique Nihei <gu...@espressif.com>
AuthorDate: Tue Jun 8 09:13:04 2021 -0300

    tools/ci: Revert workaround for issue with avr-binutils
    
    avr-binutils homebrew recipe has been fixed upstream:
    https://github.com/osx-cross/homebrew-avr/issues/243
    
    This reverts commit 37e30ccc54b938a658fd211ed7e2ffa752900f0a.
---
 tools/ci/cibuild.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/tools/ci/cibuild.sh b/tools/ci/cibuild.sh
index 835b662..bb604ec 100755
--- a/tools/ci/cibuild.sh
+++ b/tools/ci/cibuild.sh
@@ -227,12 +227,7 @@ function avr-gcc-toolchain {
     case $os in
       Darwin)
         brew tap osx-cross/avr
-        # 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
+        brew install avr-gcc
         ;;
     esac
   fi