Skip to content

Commit 7b9e06d

Browse files
committed
ci: Handle case where prebuilt was cached but brew install binutils
1 parent 1efd200 commit 7b9e06d

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,11 @@ jobs:
197197
run: |
198198
cyg-get make gcc-core gcc-g++ flex git bison byacc gperf gdb unzip awk `
199199
automake-1.15 autoconf wget xxd libmpc-devel libncurses-devel `
200-
libmpfr-devel zlib-devel
200+
libmpfr-devel zlib-devel patch
201201
- name: Set Cygwin PATH env
202202
run: |
203203
echo '::set-env name=PATH::C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin'
204+
echo "::add-matcher::nuttx/.github/gcc.json"
204205
- name: Run builds
205206
shell: cmd
206207
run: |

cibuild.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,9 @@ function binutils {
348348
case $os in
349349
Darwin)
350350
brew install binutils
351+
# It is possible we cached prebuilt but did brew install so recreate
352+
# simlink if it exists
353+
rm -f $prebuilt/bintools/bin/objcopy
351354
ln -s /usr/local/opt/binutils/bin/objcopy $prebuilt/bintools/bin/objcopy
352355
;;
353356
esac

0 commit comments

Comments
 (0)