Use AC_TRY_COMPILE instead of AC_TRY_RUN when configuring w/ OpenSSL, since we don't actually use test prog output, and the run requirement breaks cross compiling w/ OpenSSL.

This commit is contained in:
Brian Cox 2016-06-28 22:15:29 -07:00
parent 207189dafd
commit d6eb11a311
2 changed files with 13 additions and 14 deletions

25
configure vendored
View File

@ -7139,13 +7139,7 @@ else
# Basic test to check for compatible library and # Basic test to check for compatible library and
# correct linking # correct linking
if test "$cross_compiling" = yes; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run test program while cross compiling
See \`config.log' for more details" "$LINENO" 5; }
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#include <string.h> #include <string.h>
@ -7158,18 +7152,23 @@ int main(void)
return(RAND_status() <= 0); return(RAND_status() <= 0);
} }
_ACEOF int
if ac_fn_c_try_run "$LINENO"; then : main ()
{
found_crypto=1 found_crypto=1
break; break;
fi ;
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ return 0;
conftest.$ac_objext conftest.beam conftest.$ac_ext }
fi _ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test ! -z "$found_crypto" ; then if test ! -z "$found_crypto" ; then
break; break;
fi fi

View File

@ -371,7 +371,7 @@ then
# Basic test to check for compatible library and # Basic test to check for compatible library and
# correct linking # correct linking
AC_TRY_RUN( AC_TRY_COMPILE(
[ [
#include <string.h> #include <string.h>
#include <openssl/rand.h> #include <openssl/rand.h>