diff options
author | Joshua Colp <jcolp@digium.com> | 2017-06-12 15:32:12 -0500 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-06-12 15:32:12 -0500 |
commit | ac5f40f797f6eb3de87604cddacd9c3d8c997b10 (patch) | |
tree | f4ecd2e333ea7bd7aa53e8414637a3515a4fa939 | |
parent | db5245f9fde620afdd9b2c7c327bd1b77d8d4718 (diff) | |
parent | e497a76d24ea079beb48968e9a2ef2b8102dd149 (diff) |
Merge "eventfd: Disable during cross compilation"
-rwxr-xr-x | configure | 8 | ||||
-rw-r--r-- | configure.ac | 3 |
2 files changed, 5 insertions, 6 deletions
@@ -18024,10 +18024,9 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have usable eventfd support" >&5 $as_echo_n "checking if we have usable eventfd support... " >&6; } if test "$cross_compiling" = yes; then : - { { $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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compile" >&5 +$as_echo "cross-compile" >&6; } + else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -18049,7 +18048,6 @@ $as_echo "#define HAVE_EVENTFD 1" >>confdefs.h else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext diff --git a/configure.ac b/configure.ac index 9c07a4f6d..d7fb2171e 100644 --- a/configure.ac +++ b/configure.ac @@ -1131,7 +1131,8 @@ AC_RUN_IFELSE( [return eventfd(0, EFD_NONBLOCK | EFD_SEMAPHORE) == -1;])], AC_MSG_RESULT(yes) AC_DEFINE([HAVE_EVENTFD], 1, [Define to 1 if your system supports eventfd and the EFD_NONBLOCK and EFD_SEMAPHORE flags.]), - AC_MSG_RESULT(no) + AC_MSG_RESULT(no), + AC_MSG_RESULT(cross-compile) ) AST_GCC_ATTRIBUTE(pure) |