Imported Upstream version 5.20.0.180

Former-commit-id: ff953ca879339fe1e1211f7220f563e1342e66cb
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-02-04 20:11:37 +00:00
parent 0e2d47d1c8
commit 0510252385
3360 changed files with 83827 additions and 39243 deletions

View File

@@ -216,12 +216,12 @@ etc/mono/config: ../data/config Makefile $(symlinks)
else \
echo "Unknown directory '$(abs_top_builddir)/support'" && false; \
fi
if test -d "$(abs_top_builddir)/mono/metadata"; then \
sed 's,target="$$mono_libdir/libmono-system-native$(libsuffix)",target="$(abs_top_builddir)/mono/metadata/libmono-system-native.la",' $@ > $@.tmp \
if test -d "$(abs_top_builddir)/mono/native"; then \
sed 's,target="$$mono_libdir/$(MONO_NATIVE_LIBRARY_NAME)$(libsuffix)",target="$(abs_top_builddir)/mono/native/$(MONO_NATIVE_LIBRARY_NAME).la",' $@ > $@.tmp \
&& mv $@.tmp $@ \
; \
else \
echo "Unknown directory '$(abs_top_builddir)/mono/metadata'" && false; \
echo "Unknown directory '$(abs_top_builddir)/mono/native'" && false; \
fi
if test -d "$(abs_top_builddir)/mono/btls/build-shared"; then \
sed 's,target="$$mono_libdir/libmono-btls-shared$(libsuffix)",target="$(abs_top_builddir)/mono/btls/build-shared/libmono-btls-shared$(libsuffix)",' $@ > $@.tmp \

View File

@@ -105,7 +105,8 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/mkinstalldirs $(srcdir)/mono-wrapper.in \
$(srcdir)/monodis-wrapper.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/apple-target.m4 \
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
@@ -175,6 +176,7 @@ CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CXXFLAGS_COMMON = @CXXFLAGS_COMMON@
CXX_ADD_CFLAGS = @CXX_ADD_CFLAGS@
CXX_REMOVE_CFLAGS = @CXX_REMOVE_CFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -248,6 +250,22 @@ MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
MONO_JEMALLOC_ASSERT = @MONO_JEMALLOC_ASSERT@
MONO_JEMALLOC_DEFAULT = @MONO_JEMALLOC_DEFAULT@
MONO_JEMALLOC_ENABLED = @MONO_JEMALLOC_ENABLED@
MONO_NATIVE_CC = @MONO_NATIVE_CC@
MONO_NATIVE_CFLAGS = @MONO_NATIVE_CFLAGS@
MONO_NATIVE_COMPAT_CFLAGS = @MONO_NATIVE_COMPAT_CFLAGS@
MONO_NATIVE_COMPAT_LDFLAGS = @MONO_NATIVE_COMPAT_LDFLAGS@
MONO_NATIVE_CPPFLAGS = @MONO_NATIVE_CPPFLAGS@
MONO_NATIVE_CXX = @MONO_NATIVE_CXX@
MONO_NATIVE_CXXFLAGS = @MONO_NATIVE_CXXFLAGS@
MONO_NATIVE_LDFLAGS = @MONO_NATIVE_LDFLAGS@
MONO_NATIVE_LIBADD = @MONO_NATIVE_LIBADD@
MONO_NATIVE_LIBRARY_NAME = @MONO_NATIVE_LIBRARY_NAME@
MONO_NATIVE_PLATFORM = @MONO_NATIVE_PLATFORM@
MONO_NATIVE_PLATFORM_TYPE = @MONO_NATIVE_PLATFORM_TYPE@
MONO_NATIVE_PLATFORM_TYPE_COMPAT = @MONO_NATIVE_PLATFORM_TYPE_COMPAT@
MONO_NATIVE_PLATFORM_TYPE_UNIFIED = @MONO_NATIVE_PLATFORM_TYPE_UNIFIED@
MONO_NATIVE_UNIFIED_CFLAGS = @MONO_NATIVE_UNIFIED_CFLAGS@
MONO_NATIVE_UNIFIED_LDFLAGS = @MONO_NATIVE_UNIFIED_LDFLAGS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -681,12 +699,12 @@ etc/mono/config: ../data/config Makefile $(symlinks)
else \
echo "Unknown directory '$(abs_top_builddir)/support'" && false; \
fi
if test -d "$(abs_top_builddir)/mono/metadata"; then \
sed 's,target="$$mono_libdir/libmono-system-native$(libsuffix)",target="$(abs_top_builddir)/mono/metadata/libmono-system-native.la",' $@ > $@.tmp \
if test -d "$(abs_top_builddir)/mono/native"; then \
sed 's,target="$$mono_libdir/$(MONO_NATIVE_LIBRARY_NAME)$(libsuffix)",target="$(abs_top_builddir)/mono/native/$(MONO_NATIVE_LIBRARY_NAME).la",' $@ > $@.tmp \
&& mv $@.tmp $@ \
; \
else \
echo "Unknown directory '$(abs_top_builddir)/mono/metadata'" && false; \
echo "Unknown directory '$(abs_top_builddir)/mono/native'" && false; \
fi
if test -d "$(abs_top_builddir)/mono/btls/build-shared"; then \
sed 's,target="$$mono_libdir/libmono-btls-shared$(libsuffix)",target="$(abs_top_builddir)/mono/btls/build-shared/libmono-btls-shared$(libsuffix)",' $@ > $@.tmp \