nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 05:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better detection for certain broken cross-compiling situations.

Browse Source 
Fixes bug 9869; patch from Benedikt Gollatz.
This commit is contained in:
Nick Mathewson 2013-10-21 13:30:38 -04:00
parent 21ac292820
commit b7a17de454
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
changes/bug9869 Normal file
View File

@ -0,0 +1,7 @@
o Minor features (build):
- Assume that a user using configure --host wants to cross-
compile and error if we cannot find a properly named tool-
chain. Add --disable-tool-name-check to enable the user
to build nevertheless. Addresses ticket 9869. Patch by
Benedikt Gollatz.

17
configure.ac
View File

@ -158,12 +158,29 @@ fi])
AC_ARG_ENABLE(bufferevents,
AS_HELP_STRING(--enable-bufferevents, use Libevent's buffered IO.))
AC_ARG_ENABLE(tool-name-check,
AS_HELP_STRING(--disable-tool-name-check, check for sanely named toolchain when cross-compiling))
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
dnl Check whether the above macro has settled for a simply named tool even
dnl though we're cross compiling. We must do this before running AC_PROG_CC,
dnl because that will find any cc on the system, not only the cross-compiler,
dnl and then verify that a binary built with this compiler runs on the
dnl build system. It will then come to the false conclusion that we're not
dnl cross-compiling.
if test x$enable_tool_name_check != xno; then
if test x$ac_tool_warned = xyes; then
AC_MSG_ERROR([We are cross compiling but could not find a properly named toolchain. Do you have your cross-compiling toolchain in PATH? (You can --disable-tool-name-check to ignore this.)])
elif test "x$ac_ct_AR" != x -a x$cross_compiling = xmaybe; then
AC_MSG_ERROR([We think we are cross compiling but could not find a properly named toolchain. Do you have your cross-compiling toolchain in PATH? (You can --disable-tool-name-check to ignore this.)])
fi
fi
AC_PROG_CC
AC_PROG_CPP
AC_PROG_MAKE_SET