From 95fc31714c85cfed72f6e3908f54035449a39cde Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 2 Jan 2021 16:54:17 +0100 Subject: Fix libssh re-linking error (it ended up linked as @rpath/libssh.4.dylib) --- platform/osx/make_dmg.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index b61a08a01..573069424 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -284,7 +284,7 @@ function relink_relative { local linkers=("$@") for obj in "${linkers[@]}"; do - deps=`otool -L "$obj" | awk '{print $1}' | egrep "($to_relink)" | egrep "($ENV|$ROOT|boost|libicu)"` + deps=`otool -L "$obj" | awk '{print $1}' | egrep "($to_relink)" | egrep "($ENV|$ROOT|boost|libicu|libssh)"` changes="" for dep in $deps; do base=`basename $dep` @@ -313,11 +313,11 @@ function relink_absolute { local linkers=("$@") for obj in "${linkers[@]}"; do - deps=`otool -L "$obj" | awk '{print $1}' | egrep "($to_relink)" | egrep "($ENV|$ROOT|boost|libicu)"` - for dep in $deps; do - base=`basename $dep` - install_name_tool -change "$dep" "$target"/$base -id `basename "$obj"` "$obj" - done + deps=`otool -L "$obj" | awk '{print $1}' | egrep "($to_relink)" | egrep "($ENV|$ROOT|boost|libicu|libssh)"` + for dep in $deps; do + base=`basename $dep` + install_name_tool -change "$dep" "$target"/$base -id `basename "$obj"` "$obj" + done done } -- cgit v1.2.3