]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
scripts/build/combine_libs: use $AR rather than ar
authorEmery Hemingway <ehmry@posteo.net>
Fri, 16 Apr 2021 13:17:43 +0000 (15:17 +0200)
committerNick Mathewson <nickm@torproject.org>
Mon, 19 Apr 2021 15:28:20 +0000 (11:28 -0400)
Using a custom ar at $AR may be necessary for cross-compilation.

Closes #40369

Signed-off-by: David Goulet <dgoulet@torproject.org>
changes/ticket40369 [new file with mode: 0644]
scripts/build/combine_libs

diff --git a/changes/ticket40369 b/changes/ticket40369
new file mode 100644 (file)
index 0000000..b08088c
--- /dev/null
@@ -0,0 +1,2 @@
+  o Minor feature (build, cross-compilation):
+    - Allow a custom ar for cross-compilation purposes. Closes ticket 40369.
index fb311552feecbcbb5a550a918587f530b6e9a335..9c87f68248b68f922e85b64562cecd9654e5cf39 100755 (executable)
@@ -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