summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-12-17 22:36:44 +0100
committerCarl Hetherington <cth@carlh.net>2021-12-18 11:11:54 +0100
commitda89db54b5d2569b28835f82f0802a88eeb06e20 (patch)
treeb56d6e39eec3dad4d77a25a2ec4e54f53e882198 /platform
parent771cca171b8c635b2bcab7ffbcedf6deab9e21f2 (diff)
Fix inexplicable change to dylib paths with new VM.
After re-creating the macOS build VM, suddenly liblwext4 ends up linked as @rpath/liblwext4.dylib which breaks the DoM make_dmg script. I can only guess this is due to me installing a newer CMake.
Diffstat (limited to 'platform')
-rw-r--r--platform/osx/make_dmg.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index a48b1e6ae..3df5c57a2 100644
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -262,7 +262,7 @@ function relink_relative {
for arch in $arch1_name $arch2_name; do
for obj in "${linkers[@]}"; do
- deps=`otool -arch $arch -L "$obj" | awk '{print $1}' | egrep "($to_relink)" | egrep "($ENV|$ROOT|boost|libicu|libssh)"`
+ deps=`otool -arch $arch -L "$obj" | awk '{print $1}' | egrep "($to_relink)" | egrep "($ENV|$ROOT|@rpath|boost|libicu|libssh)"`
changes=""
for dep in $deps; do
base=`basename $dep`