nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.5' into maint-0.4.6

Browse Source
This commit is contained in:
Nick Mathewson 2021-04-19 11:30:00 -04:00
commit d162b98548
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/ticket40369 Normal file
View File

@ -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.

2
scripts/build/combine_libs
View File

@ -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