From: Aleksey Kliger (λgeek) <alklig@microsoft.com>
Date: Wed, 26 Jun 2019 15:10:03 +0000 (-0400)
Subject: [sdks] dynamically link libmonosgen to mono-sgen for monodroid host builds (mono... 
X-Git-Tag: submit/tizen/20210909.063632~10331^2~5^2~1066
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4fdf15bf79dfb0d96bb0796831d6f7f8b57c4f24;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

[sdks] dynamically link libmonosgen to mono-sgen for monodroid host builds (mono/mono#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


Commit migrated from https://github.com/mono/mono/commit/927c608184b86b6c03958ba9aecec02340cd0661
---

diff --git a/src/mono/configure.ac b/src/mono/configure.ac
index 8725e29..4155ada 100644
--- a/src/mono/configure.ac
+++ b/src/mono/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/src/mono/mono/utils/mono-mmap.h b/src/mono/mono/utils/mono-mmap.h
index 8cf629a..25ce4ec 100644
--- a/src/mono/mono/utils/mono-mmap.h
+++ b/src/mono/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);