commit de33be6e32ad9d7eef40de826b8083905293fd96 parent 7080e748e5a1d1ba2fe0b7d084394eb6743a5c8e Author: Nick Mathewson <nickm@torproject.org> Date: Mon, 19 Apr 2021 11:30:00 -0400 Merge branch 'maint-0.4.6' Diffstat:
| A | changes/ticket40369 | | | 4 | ++++ |
| M | scripts/build/combine_libs | | | 2 | +- |
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/changes/ticket40369 b/changes/ticket40369 @@ -0,0 +1,4 @@ + o Minor bugfixes (build, cross-compilation): + - Allow a custom "ar" for cross-compilation. Our previous build script + had used the $AR environment variable in most places, but it missed + one. Fixes bug 40369; bugfix on 0.4.5.1-alpha. diff --git 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