From cc1c568d615a1d9c9e9e8d6c823649fe13b8ca5f Mon Sep 17 00:00:00 2001 From: William Vinnicombe Date: Sun, 8 Sep 2024 00:32:00 +0100 Subject: [PATCH] Just copy libftdi dylib --- build_macos.sh | 2 -- packages/macos/openocd/build-openocd.sh | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build_macos.sh b/build_macos.sh index 54d4cea..cc8b4df 100755 --- a/build_macos.sh +++ b/build_macos.sh @@ -9,8 +9,6 @@ SKIP_OPENOCD=${SKIP_OPENOCD-0} # Install prerequisites arch -x86_64 /usr/local/bin/brew install jq libtool libusb automake hidapi arch -arm64 /opt/homebrew/bin/brew install jq libtool libusb automake hidapi -# Uninstall libftdi, as it's not required -arch -arm64 /opt/homebrew/bin/brew uninstall libftdi # Risc-V prerequisites echo "Listing local" ls /usr/local/bin diff --git a/packages/macos/openocd/build-openocd.sh b/packages/macos/openocd/build-openocd.sh index b75db04..0c74753 100755 --- a/packages/macos/openocd/build-openocd.sh +++ b/packages/macos/openocd/build-openocd.sh @@ -22,4 +22,8 @@ libhidpath=($(otool -L $INSTALLDIR/openocd | grep libhidapi)) echo ${libhidpath[0]} cp "${libhidpath[0]}" $INSTALLDIR/libhidapi.dylib install_name_tool -change "${libhidpath[0]}" @loader_path/libhidapi.dylib $INSTALLDIR/openocd +libftdipath=($(otool -L $INSTALLDIR/openocd | grep libftdi)) +echo ${libftdipath[0]} +cp "${libftdipath[0]}" $INSTALLDIR/libftdi.dylib +install_name_tool -change "${libftdipath[0]}" @loader_path/libftdi.dylib $INSTALLDIR/openocd install_name_tool -add_rpath @loader_path/ $INSTALLDIR/openocd