From 7bbf991bfff66e3e35ecc7e3a7217a8e81364af9 Mon Sep 17 00:00:00 2001 From: Alexander Kyte Date: Fri, 27 May 2016 11:32:53 -0400 Subject: [PATCH] [runtime] Replace pedump boehm dependency with sgen dependency --- mono/metadata/Makefile.am | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am index cdf42e498d9..87f9a916dd9 100644 --- a/mono/metadata/Makefile.am +++ b/mono/metadata/Makefile.am @@ -33,7 +33,7 @@ platform_sources += ../../support/libm/complex.c endif if SHARED_MONO -if SUPPORT_BOEHM +if SUPPORT_SGEN bin_PROGRAMS = pedump endif endif @@ -301,27 +301,28 @@ if DTRACE_G_REQUIRED PEDUMP_DTRACE_OBJECT = pedump-dtrace.$(OBJEXT) -pedump-dtrace.$(OBJEXT): $(top_srcdir)/data/mono.d libmonoruntime.la ../io-layer/libwapi.la ../utils/libmonoutils.la +pedump-dtrace.$(OBJEXT): $(top_srcdir)/data/mono.d $(shared_sgen_libraries) ../io-layer/libwapi.la ../utils/libmonoutils.la DTRACE="$(DTRACE)" DTRACEFLAGS="$(DTRACEFLAGS)" AR="$(AR)" $(SHELL) $(top_srcdir)/data/dtrace-prelink.sh \ - --pic pedump-dtrace.$(OBJEXT) $(top_srcdir)/data/mono.d libmonoruntime.la ../io-layer/libwapi.la ../utils/libmonoutils.la + --pic pedump-dtrace.$(OBJEXT) $(top_srcdir)/data/mono.d $(shared_sgen_libraries) ../io-layer/libwapi.la ../utils/libmonoutils.la else PEDUMP_DTRACE_OBJECT = endif if SHARED_MONO -if SUPPORT_BOEHM pedump_SOURCES = \ pedump.c -pedump_LDADD = libmonoruntime.la ../io-layer/libwapi.la ../utils/libmonoutils.la \ - $(LIBGC_LIBS) $(GLIB_LIBS) -lm $(LIBICONV) $(PEDUMP_DTRACE_OBJECT) +$(top_srcdir)/mono/sgen/libmonosgen.la: + make -w -C $(top_srcdir)/mono/sgen libmonosgen.la + +pedump_LDADD = $(sgen_libraries) $(top_srcdir)/mono/sgen/libmonosgen.la ../io-layer/libwapi.la ../utils/libmonoutils.la \ + $(GLIB_LIBS) -lm $(LIBICONV) $(PEDUMP_DTRACE_OBJECT) if PLATFORM_DARWIN pedump_LDFLAGS=-framework CoreFoundation -framework Foundation endif endif -endif EXTRA_DIST = $(win32_sources) $(unix_sources) $(null_sources) runtime.h \ threadpool-ms-io-poll.c threadpool-ms-io-epoll.c threadpool-ms-io-kqueue.c -- 2.25.1