diff options
| author | Nick Mathewson <nickm@torproject.org> | 2021-04-19 11:30:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2021-04-19 11:30:00 -0400 |
| commit | de33be6e32ad9d7eef40de826b8083905293fd96 (patch) | |
| tree | c7e049328f9645811596c55a1220a4a87522c087 /scripts | |
| parent | 7080e748e5a1d1ba2fe0b7d084394eb6743a5c8e (diff) | |
| parent | d162b98548934f575123ca9bff45b85a9eb2bdf5 (diff) | |
| download | tor-de33be6e32ad9d7eef40de826b8083905293fd96.tar.gz tor-de33be6e32ad9d7eef40de826b8083905293fd96.zip | |
Merge branch 'maint-0.4.6'
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build/combine_libs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/build/combine_libs b/scripts/build/combine_libs index fb311552fe..9c87f68248 100755 --- a/scripts/build/combine_libs +++ b/scripts/build/combine_libs @@ -25,7 +25,7 @@ for input in "$@"; do dir="$TMPDIR"/$(basename "$input" .a) mkdir "$dir" cd "$dir">/dev/null - ar x "$abs" + "${AR:-ar}" x "$abs" done cd "$TMPDIR" >/dev/null |