ci: Handle case where prebuilt was cached but brew install binutils

apache · Sep 28, 2020 · 7b9e06d · 7b9e06d
1 parent 1efd200
commit 7b9e06d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -197,10 +197,11 @@ jobs:
       run: |
         cyg-get make gcc-core gcc-g++ flex git bison byacc gperf gdb unzip awk `
                 automake-1.15 autoconf wget xxd libmpc-devel libncurses-devel `
-                libmpfr-devel zlib-devel
+                libmpfr-devel zlib-devel patch
     - name: Set Cygwin PATH env
       run: |
         echo '::set-env name=PATH::C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin'
+        echo "::add-matcher::nuttx/.github/gcc.json"
     - name: Run builds
       shell: cmd
       run: |

diff --git a/cibuild.sh b/cibuild.sh
@@ -348,6 +348,9 @@ function binutils {
     case $os in
       Darwin)
         brew install binutils
+	# It is possible we cached prebuilt but did brew install so recreate
+	# simlink if it exists
+        rm -f $prebuilt/bintools/bin/objcopy
         ln -s /usr/local/opt/binutils/bin/objcopy $prebuilt/bintools/bin/objcopy
         ;;
     esac