diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-05-03 13:48:56 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2022-05-03 22:35:21 -0400 |
| commit | 6e12e3c178fe9ad16131eb3c089bd6578976f5d6 (patch) | |
| tree | 113a35c576f586cb3d1fee22629ed347b31ad065 | |
| parent | 4eaf0f33c10b7e8fe544f848520df075fc69ef25 (diff) | |
| download | haskell-wip/T21485.tar.gz | |
configure: Check for ffi.hwip/T21485
As noted in #21485, we checked for ffi.h yet then failed to throw an
error if it is missing.
Fixes #21485.
| -rw-r--r-- | m4/fp_find_libffi.m4 | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/m4/fp_find_libffi.m4 b/m4/fp_find_libffi.m4 index ddc511553c..bf52afefbb 100644 --- a/m4/fp_find_libffi.m4 +++ b/m4/fp_find_libffi.m4 @@ -49,6 +49,7 @@ AC_DEFUN([FP_FIND_LIBFFI], CFLAGS="$LIBFFI_CFLAGS $CFLAGS" LDFLAGS2="$LDFLAGS" LDFLAGS="$LIBFFI_LDFLAGS $LDFLAGS" + if test "$HostOS" = "openbsd"; then # OpenBSD's libffi is not directly linked to the libpthread but @@ -58,10 +59,16 @@ AC_DEFUN([FP_FIND_LIBFFI], # symbols. LDFLAGS="$LDFLAGS -lpthread" fi + AC_CHECK_LIB(ffi, ffi_call, - [AC_CHECK_HEADERS([ffi.h], [break], []) - AC_DEFINE([HAVE_SYSTEM_LIBFFI], [1], [Define to 1 if you have libffi.])], - [AC_MSG_ERROR([Cannot find system libffi])]) + [AC_CHECK_HEADERS( + [ffi.h], + [AC_DEFINE([HAVE_SYSTEM_LIBFFI], [1], [Define to 1 if you have libffi.])], + [AC_MSG_ERROR([Cannot find ffi.h for system libffi])] + )], + [AC_MSG_ERROR([Cannot find system libffi])] + ) + CFLAGS="$CFLAGS2" LDFLAGS="$LDFLAGS2" ]) |