From 0d06b597263111051bed5214564ee7099840a6e1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksey=20Kliger=20=28=CE=BBgeek=29?= Date: Tue, 5 Jul 2016 10:21:55 -0400 Subject: [PATCH] [profiler] Actually link against libmono where necessary (#3232) Previously $(LIBMONO) was empty and bitcode targets (which set -no-undefined) had linker errors. --- mono/profiler/Makefile.am | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mono/profiler/Makefile.am b/mono/profiler/Makefile.am index bb4e985687c..3d7eb62e400 100644 --- a/mono/profiler/Makefile.am +++ b/mono/profiler/Makefile.am @@ -53,6 +53,8 @@ endif endif endif +monodir=$(top_builddir) + # The log profiler uses eglib functions, so it needs to be linked against # libeglib in shared mode, but not in static mode, since that would # leads to duplicate symbols when it is linked into an app which @@ -60,19 +62,19 @@ endif # functionality, so create a separate static version of the library. libmono_profiler_aot_la_SOURCES = mono-profiler-aot.c -libmono_profiler_aot_la_LIBADD = $(LIBMONO) $(GLIB_LIBS) $(LIBICONV) +libmono_profiler_aot_la_LIBADD = $(monodir)/mono/mini/$(LIBMONO_LA) $(GLIB_LIBS) $(LIBICONV) libmono_profiler_aot_la_LDFLAGS = $(prof_ldflags) libmono_profiler_aot_static_la_SOURCES = mono-profiler-aot.c libmono_profiler_aot_static_la_LDFLAGS = -static libmono_profiler_iomap_la_SOURCES = mono-profiler-iomap.c -libmono_profiler_iomap_la_LIBADD = $(LIBMONO) $(GLIB_LIBS) $(LIBICONV) +libmono_profiler_iomap_la_LIBADD = $(monodir)/mono/mini/$(LIBMONO_LA) $(GLIB_LIBS) $(LIBICONV) libmono_profiler_iomap_la_LDFLAGS = $(prof_ldflags) libmono_profiler_iomap_static_la_SOURCES = mono-profiler-iomap.c libmono_profiler_iomap_static_la_LDFLAGS = -static libmono_profiler_log_la_SOURCES = proflog.c -libmono_profiler_log_la_LIBADD = $(LIBMONO) $(GLIB_LIBS) $(Z_LIBS) +libmono_profiler_log_la_LIBADD = $(monodir)/mono/mini/$(LIBMONO_LA) $(GLIB_LIBS) $(Z_LIBS) libmono_profiler_log_la_LDFLAGS = $(prof_ldflags) libmono_profiler_log_static_la_SOURCES = proflog.c libmono_profiler_log_static_la_LDFLAGS = -static -- 2.25.1