From 2fb07d6c6d5b3915ef4665391febbb7b8be09fb5 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Fri, 21 Oct 2016 17:29:13 -0400 Subject: =?UTF-8?q?[btls]=20Convert=20BTLS=20icalls=20to=20pinvokes=20by?= =?UTF-8?q?=20invoking=20them=20using=20[DllImp=E2=80=A6=20(#3799)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [btls] Convert BTLS icalls to pinvokes by invoking them using [DllImport("__Internal")], which will make it easier to redirect them to a separate dylib in the future. * [btls] Add a --enable-dynamic-btls configure flag to enable compiling btls into a separate shared library instead of embedding it into the runtime. --- runtime/Makefile.am | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'runtime') diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 068bb1d3dc0..9ca31834655 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -165,10 +165,13 @@ CLEANFILES = etc/mono/config etc/mono/config: ../data/config Makefile $(symlinks) d=`cd ../support && pwd`; \ sed 's,target="$$mono_libdir/libMonoPosixHelper$(libsuffix)",target="'$$d'/libMonoPosixHelper.la",' ../data/config > $@t + d=`cd ../mono/btls/build-shared && pwd`; \ + sed 's,target="$$mono_libdir/libmono-btls-shared$(libsuffix)",target="'$$d'/libmono-btls-shared$(libsuffix)",' $@t > $@tt if test -z "$(libgdiplus_loc)"; then :; else \ - sed 's,target="$(libgdiplus_install_loc)",target="$(libgdiplus_loc)",' $@t > $@tt; \ - mv -f $@tt $@t; fi - mv -f $@t $@ + sed 's,target="$(libgdiplus_install_loc)",target="$(libgdiplus_loc)",' $@tt > $@ttt; \ + mv -f $@ttt $@tt; fi + mv -f $@tt $@ + rm -f $@t $(tmpinst)/bin/mono: mono-wrapper etc/mono/config $(mkinstalldirs) $(tmpinst)/bin -- cgit v1.2.3