[incubator-nuttx-testing] branch master updated: ci: Handle case where prebuilt was cached but brew install binutils

[xi...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 4e5964f  ci: Handle case where prebuilt was cached but brew install binutils
4e5964f is described below

commit 4e5964f5c2dedcd95ab9a46b7f1d27c7c5665dc2
Author: Brennan Ashton <ba...@brennanashton.com>
AuthorDate: Sun Sep 27 18:53:53 2020 -0700

    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 <ba...@brennanashton.com>
---
 cibuild.sh | 3 +++
 1 file changed, 3 insertions(+)

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