aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/build/combine_libs10
1 files changed, 10 insertions, 0 deletions
diff --git a/scripts/build/combine_libs b/scripts/build/combine_libs
index a855171dc7..9dec483602 100755
--- a/scripts/build/combine_libs
+++ b/scripts/build/combine_libs
@@ -11,6 +11,15 @@ abspath() {
echo "$(cd "$(dirname "$1")" >/dev/null && pwd)/$(basename "$1")"
}
+apple_symdef_fix() {
+ # On modern macOS and iOS we need to remove the "__.SYMDEF" and "__.SYMDEF
+ # SORTED" before we repack the archive.
+ # See: tor#40683.
+ if [ "$(uname -s)" = "Darwin" ] ; then
+ find . -name "__.SYMDEF*" -delete
+ fi
+}
+
TARGET=$(abspath "$1")
shift
@@ -25,6 +34,7 @@ for input in "$@"; do
done
cd "$TMPDIR" >/dev/null
+apple_symdef_fix
"${AR:-ar}" "${ARFLAGS:-cru}" library.tmp.a ./*/**
"${RANLIB:-ranlib}" library.tmp.a
mv -f library.tmp.a "$TARGET"