diff options
| author | Calvin <calvin@openmailbox.org> | 2017-02-15 02:05:31 +0300 |
|---|---|---|
| committer | Calvin <calvin@openmailbox.org> | 2017-02-27 18:27:51 +0300 |
| commit | 52d4b9dcb79e9d5b0c86e6d9ff297e563d80bdee (patch) | |
| tree | 7c768b48a181accea2846f1e25c1cf0017a8e055 | |
| parent | 3e2a367d9154f01d3b4fc1dffc0c694415539cd1 (diff) | |
Improve build and configure
* detect sys/errno.h
* Fix errenous LIBS in haiku
* use HAVE_MINCORE
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | mono/utils/mono-proclib.c | 2 | ||||
| -rw-r--r-- | support/sys-mman.c | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 1ad5cd6d37d..738689b81d4 100644 --- a/configure.ac +++ b/configure.ac @@ -335,7 +335,7 @@ case "$host" in libmono_cflags="-D_REENTRANT -D_THREAD_SAFE" libdl= dnl FIXME: Does eglib pick this up? - LIBS="$LIBS -lnetwork -;textencoding" + LIBS="$LIBS -lnetwork -ltextencoding" need_link_unlink=yes AC_DEFINE(PTHREAD_POINTER_ID) dnl Haiku does not support static TLS with __thread @@ -2329,6 +2329,10 @@ if test x$host_win32 = xno; then ]) dnl ********************************** + dnl *** Checks for proclib *** + dnl ********************************** + AC_CHECK_HEADER(sys/errno.h, [AC_DEFINE(HAVE_SYS_ERRNO_H, 1, Define to 1 if you have the <sys/errno.h> header file.)]) + dnl ********************************** dnl *** Checks for MonoPosixHelper *** dnl ********************************** AC_CHECK_HEADERS(checklist.h) diff --git a/mono/utils/mono-proclib.c b/mono/utils/mono-proclib.c index 294e37a677a..5f6d145b6da 100644 --- a/mono/utils/mono-proclib.c +++ b/mono/utils/mono-proclib.c @@ -20,7 +20,7 @@ #endif #if defined(_POSIX_VERSION) -#if !defined(__HAIKU__) +#ifdef HAVE_SYS_ERRNO_H #include <sys/errno.h> #endif #include <sys/param.h> diff --git a/support/sys-mman.c b/support/sys-mman.c index 08c1fea9fd3..afbe4662444 100644 --- a/support/sys-mman.c +++ b/support/sys-mman.c @@ -88,8 +88,7 @@ Mono_Posix_Syscall_msync (void *start, mph_size_t len, int flags) int Mono_Posix_Syscall_mlock (void *start, mph_size_t len) { -/* FIXME: Haiku lacks support for m(un)lock and mincore */ -#if defined(__HAIKU__) +#if !defined(HAVE_MINCORE) return ENOSYS; #else mph_return_if_size_t_overflow (len); |