nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tor-gitlab/mr/628'

Browse Source
This commit is contained in:
David Goulet 2022-10-26 14:00:57 -04:00
commit 40aab72031
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/build/combine_libs
View File

@ -11,6 +11,15 @@ abspath() {
echo "$(cd "$(dirname "$1")" >/dev/null && pwd)/$(basename "$1")" 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") TARGET=$(abspath "$1")
shift shift
@ -25,6 +34,7 @@ for input in "$@"; do
done done
cd "$TMPDIR" >/dev/null cd "$TMPDIR" >/dev/null
apple_symdef_fix
"${AR:-ar}" "${ARFLAGS:-cru}" library.tmp.a ./*/** "${AR:-ar}" "${ARFLAGS:-cru}" library.tmp.a ./*/**
"${RANLIB:-ranlib}" library.tmp.a "${RANLIB:-ranlib}" library.tmp.a
mv -f library.tmp.a "$TARGET" mv -f library.tmp.a "$TARGET"