diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-09-07 12:11:35 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-09-07 12:11:35 -0400 |
| commit | b70a0a43750f6aabe800a83bcd7fdd6a5a14911b (patch) | |
| tree | a44e7f45860d1bcbc0b9e5de6a2eab7ed670c4b2 | |
| parent | 947012e153e76ceb8015ea426a895f21b63cd677 (diff) | |
| parent | 5f9cdee8afd3fb0db835c19993fae476e0f00033 (diff) | |
| download | tor-b70a0a43750f6aabe800a83bcd7fdd6a5a14911b.tar.gz tor-b70a0a43750f6aabe800a83bcd7fdd6a5a14911b.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
configure.in
Conflict was between two pieces of configure.in logic added to the
same place. Trivial.
| -rw-r--r-- | changes/bug3909 | 3 | ||||
| -rw-r--r-- | configure.in | 6 |
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 f3640cb721..824547c6d7 100644 --- a/configure.in +++ b/configure.in @@ -148,6 +148,12 @@ fi AC_ARG_ENABLE(bufferevents, AS_HELP_STRING(--enable-bufferevents, use Libevent's buffered IO.)) +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 |