summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-09-02 11:51:49 -0400
committerNick Mathewson <nickm@torproject.org>2011-09-07 11:59:16 -0400
commit5f9cdee8afd3fb0db835c19993fae476e0f00033 (patch)
tree654b34deeb5111214547caf97ae1d36bdf1e2df6
parent2bf0e7479bc9ec26496405ff6a1ef830cacc001b (diff)
downloadtor-5f9cdee8afd3fb0db835c19993fae476e0f00033.tar.gz
tor-5f9cdee8afd3fb0db835c19993fae476e0f00033.zip
Look for correct "ar" to cross-compile
For some reason, autoconf doesn't by default have an "AC_PROG_AR" for this -- possibly it's assumed that any "ar" you have will work everyplace. Fixes bug 3909; found by sid77. This fixes a build issue first present in fdbdb4dc1500, but the bug (of not using a correct ar) has been in every Tor version ever: it just didn't matter until then.
-rw-r--r--changes/bug39093
-rw-r--r--configure.in6
2 files changed, 9 insertions, 0 deletions
diff --git a/changes/bug3909 b/changes/bug3909
new file mode 100644
index 0000000000..0b4b292030
--- /dev/null
+++ b/changes/bug3909
@@ -0,0 +1,3 @@
+ o Build fixes:
+ - Search for a platform-specific version of "ar" when cross-compiling.
+ Should fix builds on iOS. Found by Marco Bonetti.
diff --git a/configure.in b/configure.in
index 4e84298456..52ea094024 100644
--- a/configure.in
+++ b/configure.in
@@ -118,6 +118,12 @@ if test "$enable_local_appdata" = "yes"; then
[Defined if we default to host local appdata paths on Windows])
fi
+dnl check for the correct "ar" when cross-compiling
+AN_MAKEVAR([AR], [AC_PROG_AR])
+AN_PROGRAM([ar], [AC_PROG_AR])
+AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL([AR], [ar], [ar])])
+AC_PROG_AR
+
AC_PROG_CC
AC_PROG_CPP
AC_PROG_MAKE_SET