[io-layer] Extract error (#4279)

[mono.git] / mono / dis / Makefile.am

diff --git a/mono/dis/Makefile.am b/mono/dis/Makefile.am
index fd581ff5514d8c6a5cbe0dfb7a2b18098cae22a1..14090d8c3ecc5d60c50a5d2225e23b0a559b3e47 100644 (file)
--- a/mono/dis/Makefile.am
+++ b/mono/dis/Makefile.am
@@ -4,34 +4,29 @@ if HOST_WIN32
 export HOST_CC
 endif
 
-if JIT_SUPPORTED
-if !SHARED_MONO
-static_libs=   \
-       $(top_builddir)/mono/metadata/libmonoruntime-static.la  \
-       $(top_builddir)/mono/io-layer/libwapi.la        \
-       $(top_builddir)/mono/utils/libmonoutils.la \
-       $(GLIB_LIBS) $(LIBICONV) \
-       $(LIBGC_STATIC_LIBS)
-
-runtime_lib=../mini/$(LIBMONO_LA) $(static_libs)
-else
-runtime_lib=../mini/$(LIBMONO_LA)
-endif
+if SUPPORT_SGEN
+metadata_lib=$(top_builddir)/mono/metadata/libmonoruntimesgen-static.la
+gc_lib=$(top_builddir)/mono/sgen/libmonosgen-static.la
 else
-runtime_lib=../interpreter/libmint.la
+metadata_lib=$(top_builddir)/mono/metadata/libmonoruntime-static.a
+gc_lib=$(LIBGC_STATIC_LIBS)
 endif
 
+runtime_lib=   \
+       $(metadata_lib) \
+       $(gc_lib)       \
+       $(top_builddir)/mono/utils/libmonoutils.la \
+       $(GLIB_LIBS) $(LIBICONV)
+
 if DISABLE_EXECUTABLES
 bin_PROGRAMS =
 else
 if DISABLE_LIBRARIES
 bin_PROGRAMS =
 else
-if SUPPORT_BOEHM
 bin_PROGRAMS = monodis
 endif
 endif
-endif
 
 noinst_LIBRARIES = libmonodis.a
 
@@ -55,11 +50,12 @@ monodis_LDADD =                     \
        libmonodis.a                    \
        $(runtime_lib)                  \
        $(LLVM_LIBS)                    \
+       $(LLVM_LDFLAGS)                 \
        $(GLIB_LIBS)                    \
        $(LIBICONV)
 
 if PLATFORM_DARWIN
-monodis_LDFLAGS=-framework CoreFoundation
+monodis_LDFLAGS=-framework CoreFoundation -framework Foundation
 endif
 
 man_MANS = monodis.1