From 2306f9cbc7086f6b51aa1cb55eb56b521fb92113 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 16 Jul 2021 12:35:43 +0200 Subject: Fix old mac (single-arch) build. --- platform/osx/make_dmg.sh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index aefa94e2c..a48b1e6ae 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -84,19 +84,25 @@ function copy_lib_root { } function copy_lib_env { - for f in $ENV/$ARCH2/lib/$1*.dylib; do - if [ -h $f ]; then - ln -s $(readlink $f) "$2/`basename $f`" - else - if [ "$ARCH2" == "" ]; then + if [ "$ARCH2" == "" ]; then + for f in $ENV/$ARCH1/lib/$1*.dylib; do + if [ -h $f ]; then + ln -s $(readlink $f) "$2/`basename $f`" + else cp $f "$2/`basename $f`" + fi + done + else + for f in $ENV/$ARCH2/lib/$1*.dylib; do + if [ -h $f ]; then + ln -s $(readlink $f) "$2/`basename $f`" else g=`echo $f | sed -e "s@/$ARCH2/@/$ARCH1/@g"` mkdir -p "$2" lipo -create $f $g -output "$2/$(basename $f)" fi - fi - done + done + fi to_relink="$to_relink|$1" } -- cgit v1.2.3