commit 4e5964f5c2dedcd95ab9a46b7f1d27c7c5665dc2
author Brennan Ashton <bashton@brennanashton.com> Sun Sep 27 18:53:53 2020 -0700
committer Xiang Xiao <xiaoxiang781216@gmail.com> Mon Sep 28 13:56:09 2020 +0800
tree 82832b7a81aa507e06f5265914cd8538ac74444c
parent d2d80e7a9b367fb6b9c7c4f4198a33286730d79c

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

We create a simlink in prebuilt for certain tools like objcopy
that are brew installed from binutils.  It is likely that we
will cache the simlink, but still need to brew install binutils
this will fail because we will try to create the symlink again.
This change always recreates the symlink if the brew install was
required.

Signed-off-by: Brennan Ashton <bashton@brennanashton.com>

cibuild.sh

diff --git a/cibuild.sh b/cibuild.sh
index 928ea8f..62ab8f1 100755
--- a/cibuild.sh
+++ b/cibuild.sh
@@ -322,6 +322,9 @@
     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