commit f09b913e18ef2a8d092b2c21840acc5f2d64c337 parent 72f52d2c8528855fc3f54173b14b1bce49dcb141 Author: David Goulet <dgoulet@torproject.org> Date: Thu, 27 Oct 2022 11:42:07 -0400 Merge branch 'tor-gitlab/mr/645' into maint-0.4.7 Diffstat:
| A | changes/ticket40683 | | | 6 | ++++++ |
| M | scripts/build/combine_libs | | | 10 | ++++++++++ |
2 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/changes/ticket40683 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. diff --git 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"