Merge pull request #3591 from directhex/mono_libdir_fallback

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

diff --git a/mono/dis/Makefile.am b/mono/dis/Makefile.am
index fcf17c001b9ffb9b531f6cec7ce17fa087fb3d8e..40f0dbf95524a9372405cbce3eef665f45f8da8f 100644 (file)
--- a/mono/dis/Makefile.am
+++ b/mono/dis/Makefile.am
@@ -6,17 +6,18 @@ endif
 
 if SUPPORT_SGEN
 metadata_lib=$(top_builddir)/mono/metadata/libmonoruntimesgen-static.la
+gc_lib=$(top_builddir)/mono/sgen/libmonosgen-static.la
 else
 metadata_lib=$(top_builddir)/mono/metadata/libmonoruntime-static.a
 gc_lib=$(LIBGC_STATIC_LIBS)
 endif
 
 runtime_lib=   \
-       ../mini/$(LIBMONO_LA) \
+       $(metadata_lib) \
+       $(gc_lib)       \
        $(top_builddir)/mono/io-layer/libwapi.la        \
        $(top_builddir)/mono/utils/libmonoutils.la \
-       $(GLIB_LIBS) $(LIBICONV) \
-       $(gc_lib)
+       $(GLIB_LIBS) $(LIBICONV)
 
 if DISABLE_EXECUTABLES
 bin_PROGRAMS =
@@ -50,6 +51,7 @@ monodis_LDADD =                       \
        libmonodis.a                    \
        $(runtime_lib)                  \
        $(LLVM_LIBS)                    \
+       $(LLVM_LDFLAGS)                 \
        $(GLIB_LIBS)                    \
        $(LIBICONV)