diff options
| author | Emery Hemingway <ehmry@posteo.net> | 2021-04-16 15:17:43 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2021-04-19 11:28:20 -0400 |
| commit | f47c6c3d1b38a7770da007f904925a50cf687906 (patch) | |
| tree | f4a178e01b2ae899e5f26deb3a30e32a3f00cf8c | |
| parent | 925ec0e0ea03357537f22f5e5c774d2c5aa02ecf (diff) | |
| download | tor-f47c6c3d1b38a7770da007f904925a50cf687906.tar.gz tor-f47c6c3d1b38a7770da007f904925a50cf687906.zip | |
scripts/build/combine_libs: use $AR rather than ar
Using a custom ar at $AR may be necessary for cross-compilation.
Closes #40369
Signed-off-by: David Goulet <dgoulet@torproject.org>
| -rw-r--r-- | changes/ticket40369 | 2 | ||||
| -rwxr-xr-x | scripts/build/combine_libs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/changes/ticket40369 b/changes/ticket40369 new file mode 100644 index 0000000000..b08088c97b --- /dev/null +++ b/changes/ticket40369 @@ -0,0 +1,2 @@ + o Minor feature (build, cross-compilation): + - Allow a custom ar for cross-compilation purposes. Closes ticket 40369. 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 |