[tor-commits] [tor/release-0.4.6] scripts/build/combine_libs: use $AR rather than ar

[nickm@xxxxxxxxxxxxxx]

commit f47c6c3d1b38a7770da007f904925a50cf687906
Author: Emery Hemingway <ehmry@xxxxxxxxxx>
Date:   Fri Apr 16 15:17:43 2021 +0200

    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@xxxxxxxxxxxxxx>
---
 changes/ticket40369        | 2 ++
 scripts/build/combine_libs | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

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



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits