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 | e6ef22ca153bd0b49536ad598907f8acb4f2b705 (patch) | |
| tree | f18c4d22db4280c514274755d1c6d6804f67196b | |
| parent | 2fc077e6766d66b6b4954c2d9a95a663f484da21 (diff) | |
| parent | cd75eac743723fca44edb650af7616393b1054ed (diff) | |
| download | tor-e6ef22ca153bd0b49536ad598907f8acb4f2b705.tar.gz tor-e6ef22ca153bd0b49536ad598907f8acb4f2b705.zip | |
Merge branch 'maint-0.4.5' into release-0.4.5
| -rw-r--r-- | changes/ticket40369 | 4 | ||||
| -rwxr-xr-x | scripts/build/combine_libs | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/ticket40369 b/changes/ticket40369 new file mode 100644 index 0000000000..abb59a7125 --- /dev/null +++ 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 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 |