Fix inexplicable change to dylib paths with new VM. v2.15.180
authorCarl Hetherington <cth@carlh.net>
Fri, 17 Dec 2021 21:36:44 +0000 (22:36 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 18 Dec 2021 10:16:45 +0000 (11:16 +0100)
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.

platform/osx/make_dmg.sh

index a48b1e6aeb299b143668ff1f3932624a2af8461f..3df5c57a208c2fcf2e99378db4cf0e320c31741b 100644 (file)
@@ -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`