From f47c6c3d1b38a7770da007f904925a50cf687906 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 16 Apr 2021 15:17:43 +0200 Subject: 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 --- changes/ticket40369 | 2 ++ scripts/build/combine_libs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 changes/ticket40369 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 -- cgit v1.2.3-54-g00ecf From cd75eac743723fca44edb650af7616393b1054ed Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 19 Apr 2021 11:29:46 -0400 Subject: Tweak changes/ticket40369 to be a bug. --- changes/ticket40369 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/changes/ticket40369 b/changes/ticket40369 index b08088c97b..abb59a7125 100644 --- a/changes/ticket40369 +++ b/changes/ticket40369 @@ -1,2 +1,4 @@ - o Minor feature (build, cross-compilation): - - Allow a custom ar for cross-compilation purposes. Closes ticket 40369. + 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. -- cgit v1.2.3-54-g00ecf