diff options
| author | skaluzka <skaluzka@protonmail.com> | 2021-08-14 21:45:44 +0200 |
|---|---|---|
| committer | skaluzka <skaluzka@protonmail.com> | 2021-08-14 21:45:44 +0200 |
| commit | 719169dbe374b85b30e8ab2493c43ab4e747302f (patch) | |
| tree | 21fccacf1bbf50d872ae87738038ea5af9324358 | |
| parent | 6260db5733582411d3fc2ee92dd58a95b16aeab7 (diff) | |
| download | tor-719169dbe374b85b30e8ab2493c43ab4e747302f.tar.gz tor-719169dbe374b85b30e8ab2493c43ab4e747302f.zip | |
Update combine_libs script
Remove commented code from production.
Align indentations to 4 spaces.
| -rwxr-xr-x | scripts/build/combine_libs | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/scripts/build/combine_libs b/scripts/build/combine_libs index 9c87f68248..a855171dc7 100755 --- a/scripts/build/combine_libs +++ b/scripts/build/combine_libs @@ -8,15 +8,11 @@ ORIGDIR="$(pwd)" trap 'cd "$ORIGDIR" && rm -rf "$TMPDIR"' 0 abspath() { - echo "$(cd "$(dirname "$1")">/dev/null && pwd)/$(basename "$1")" + echo "$(cd "$(dirname "$1")" >/dev/null && pwd)/$(basename "$1")" } TARGET=$(abspath "$1") -#echo ORIGDIR="$ORIGDIR" -#echo AR="$AR" -#echo ARFLAGS="$AFLAGS" - shift for input in "$@"; do @@ -24,12 +20,11 @@ for input in "$@"; do abs=$(abspath "$input") dir="$TMPDIR"/$(basename "$input" .a) mkdir "$dir" - cd "$dir">/dev/null + cd "$dir" >/dev/null "${AR:-ar}" x "$abs" done cd "$TMPDIR" >/dev/null -#echo "${AR:-ar}" "${ARFLAGS:-cru}" library.tmp.a ./*/** "${AR:-ar}" "${ARFLAGS:-cru}" library.tmp.a ./*/** "${RANLIB:-ranlib}" library.tmp.a mv -f library.tmp.a "$TARGET" |