From 4b3560d02b73c589e5b96e2ba44e27912beb2629 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 25 Jul 2014 14:07:51 +0100 Subject: [PATCH] Revert bad OS X build change. --- platform/osx/make_dmg.sh | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 92d707d80..a9d40c30a 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -112,15 +112,11 @@ for obj in "$WORK/$macos/dcpomatic2" "$WORK/$macos/dcpomatic2_batch" "$WORK/$mac deps=`otool -L "$obj" | awk '{print $1}' | egrep "($relink)"` changes="" for dep in $deps; do - if [ ! -h "$dep" ]; then - echo "Relinking $dep into $obj" - base=`basename $dep` - # $dep will be a path within 64/; make a 32/ path too - dep32=`echo $dep | sed -e "s/\/64\//\/32\//g"` - changes="$changes -change $dep @executable_path/../lib/$base -change $dep32 @executable_path/../lib/$base" - else - echo "Not relinking symlink $dep" - fi + echo "Relinking $dep into $obj" + base=`basename $dep` + # $dep will be a path within 64/; make a 32/ path too + dep32=`echo $dep | sed -e "s/\/64\//\/32\//g"` + changes="$changes -change $dep @executable_path/../lib/$base -change $dep32 @executable_path/../lib/$base" done if test "x$changes" != "x"; then install_name_tool $changes "$obj" -- 2.30.2