Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
David Goulet
Tor
Commits
d162b985
Commit
d162b985
authored
Apr 19, 2021
by
Nick Mathewson
🎨
Browse files
Merge branch 'maint-0.4.5' into maint-0.4.6
parents
461a3c73
cd75eac7
Changes
2
Show whitespace changes
Inline
Side-by-side
changes/ticket40369
0 → 100644
View file @
d162b985
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.
scripts/build/combine_libs
View file @
d162b985
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment