diff options
| author | Alexander Færøy <ahf@torproject.org> | 2022-10-14 12:12:46 +0200 |
|---|---|---|
| committer | Mike Perry <mikeperry-git@torproject.org> | 2022-10-27 15:18:01 +0000 |
| commit | 256339712de21d7002129aed102b637cda634ab5 (patch) | |
| tree | 1cfb80bae040d042922bf740727b9bdae2b04cbe /scripts | |
| parent | a1c40c8511b841db773e82bd8024ef3581262900 (diff) | |
| download | tor-256339712de21d7002129aed102b637cda634ab5.tar.gz tor-256339712de21d7002129aed102b637cda634ab5.zip | |
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.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build/combine_libs | 10 |
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" |