nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-gitlab/mr/419'

Browse Source
This commit is contained in:
Nick Mathewson 2021-08-18 08:39:50 -04:00
commit 00b57e81f8
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/build/combine_libs
View File

@ -8,15 +8,11 @@ ORIGDIR="$(pwd)"
trap 'cd "$ORIGDIR" && rm -rf "$TMPDIR"' 0 trap 'cd "$ORIGDIR" && rm -rf "$TMPDIR"' 0
abspath() { abspath() {
echo "$(cd "$(dirname "$1")">/dev/null && pwd)/$(basename "$1")" echo "$(cd "$(dirname "$1")" >/dev/null && pwd)/$(basename "$1")"
} }
TARGET=$(abspath "$1") TARGET=$(abspath "$1")
#echo ORIGDIR="$ORIGDIR"
#echo AR="$AR"
#echo ARFLAGS="$AFLAGS"
shift shift
for input in "$@"; do for input in "$@"; do
@ -24,12 +20,11 @@ for input in "$@"; do
abs=$(abspath "$input") abs=$(abspath "$input")
dir="$TMPDIR"/$(basename "$input" .a) dir="$TMPDIR"/$(basename "$input" .a)
mkdir "$dir" mkdir "$dir"
cd "$dir">/dev/null cd "$dir" >/dev/null
"${AR:-ar}" x "$abs" "${AR:-ar}" x "$abs"
done done
cd "$TMPDIR" >/dev/null cd "$TMPDIR" >/dev/null
#echo "${AR:-ar}" "${ARFLAGS:-cru}" library.tmp.a ./*/**
"${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"