From 927c608184b86b6c03958ba9aecec02340cd0661 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksey=20Kliger=20=28=CE=BBgeek=29?= Date: Wed, 26 Jun 2019 11:10:03 -0400 Subject: [PATCH] [sdks] dynamically link libmonosgen to mono-sgen for monodroid host builds (#15410) * [configure] Cosmetic AC_MSG_WARN fix * [runtime] Mark mono_file_map_error as MONO_API, always Fixed the `--with-static_mono=no` build on non-Win32 * [sdks] dynamically link libmonosgen to mono-sgen for monodroid host builds --- configure.ac | 2 +- mono/utils/mono-mmap.h | 4 ---- sdks/builds/android.mk | 2 ++ 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 8725e296f42..4155adadbfa 100644 --- a/configure.ac +++ b/configure.ac @@ -6948,5 +6948,5 @@ echo " $disabled " if test x$with_static_mono = xno -a "x$host_win32" != "xyes"; then - AC_MSG_WARN(Turning off static Mono is a risk, you might run into unexpected bugs) + AC_MSG_WARN([Turning off static Mono is a risk, you might run into unexpected bugs]) fi diff --git a/mono/utils/mono-mmap.h b/mono/utils/mono-mmap.h index 8cf629a7583..25ce4ecafc2 100644 --- a/mono/utils/mono-mmap.h +++ b/mono/utils/mono-mmap.h @@ -64,11 +64,7 @@ MONO_API void* mono_file_map (size_t length, int flags, int fd, guint64 offset // Last two parameters are optional. // This is mono_file_map but with optionally returning an error message. // See https://github.com/mono/mono/issues/8225. -#if defined (HOST_WIN32) MONO_API -#elif defined (__cplusplus) -G_EXTERN_C -#endif void* mono_file_map_error (size_t length, int flags, int fd, guint64 offset, void **ret_handle, const char *filepath, char **error_message); MONO_API int mono_file_unmap (void *addr, void *handle); diff --git a/sdks/builds/android.mk b/sdks/builds/android.mk index a59cc2f0945..eb330c8dab8 100644 --- a/sdks/builds/android.mk +++ b/sdks/builds/android.mk @@ -239,6 +239,7 @@ _android-$(1)_CONFIGURE_FLAGS= \ --enable-monodroid \ --with-mcs-docs=no \ --without-ikvm-native \ + --with-static_mono=no \ --disable-crash-reporting .stamp-android-$(1)-toolchain: @@ -294,6 +295,7 @@ _android-$(1)_CONFIGURE_FLAGS= \ --enable-maintainer-mode \ --enable-monodroid \ --with-monodroid \ + --with-static_mono=no \ --disable-crash-reporting ifeq ($(UNAME),Darwin) -- 2.11.4.GIT