summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-01-02 16:54:17 +0100
committerCarl Hetherington <cth@carlh.net>2021-01-04 10:48:59 +0100
commit95fc31714c85cfed72f6e3908f54035449a39cde (patch)
tree551c164fef786963b768405227c6e7e910d729d2
parenta65a6d26cf5bf673f1bf1fb105f4ca0f8bf38b9c (diff)
Fix libssh re-linking error (it ended up linked as @rpath/libssh.4.dylib)v2.15.113
-rw-r--r--platform/osx/make_dmg.sh12
1 files 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
}