From 256339712de21d7002129aed102b637cda634ab5 Mon Sep 17 00:00:00 2001 From: Alexander Færøy Date: Fri, 14 Oct 2022 12:12:46 +0200 Subject: Strip "__.SYMDEF*" before re-archiving in combine_libs on macOS and iOS. This patch changes how combine_libs works on Darwin like platforms to make sure we don't include any `__.SYMDEF` and `__.SYMDEF SORTED` symbols on the archive before we repack and run ${RANLIB} on the archive. See: tpo/core/tor#40683. --- scripts/build/combine_libs | 10 ++++++++++ 1 file changed, 10 insertions(+) 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" -- cgit v1.2.3-54-g00ecf From b30193416cb97540b5bebafa9c69a238343c2a87 Mon Sep 17 00:00:00 2001 From: Mike Perry Date: Thu, 27 Oct 2022 15:36:53 +0000 Subject: Changes file for 40683 --- changes/ticket40683 | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 changes/ticket40683 diff --git a/changes/ticket40683 b/changes/ticket40683 new file mode 100644 index 0000000000..6df078ebae --- /dev/null +++ b/changes/ticket40683 @@ -0,0 +1,6 @@ + o Minor feature (Mac and iOS build): + - Change how combine_libs works on Darwin like platforms to + make sure we don't include any `__.SYMDEF` and `__.SYMDEF SORTED` + symbols on the archive before we repack and run ${RANLIB} on the + archive. This fixes a build issue with recent Xcode versions on + Mac Silicon and iOS. Closes ticket 40683. -- cgit v1.2.3-54-g00ecf