Merge pull request #82 from Unity-Technologies/master-gc-race

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

diff --git a/mono/dis/Makefile.am b/mono/dis/Makefile.am
index 0286fee0463e18d9b336b000f0d3ba2337fd3d10..284bdbdc71c71be1ba825ed8c39d144550c745d3 100644 (file)
--- a/mono/dis/Makefile.am
+++ b/mono/dis/Makefile.am
@@ -1,11 +1,11 @@
 INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
 
-if PLATFORM_WIN32
+if HOST_WIN32
 export HOST_CC
 endif
 
 if JIT_SUPPORTED
-runtime_lib=../mini/libmono.la
+runtime_lib=../mini/libmono-$(API_VER).la
 else
 runtime_lib=../interpreter/libmint.la
 endif
@@ -33,8 +33,13 @@ monodis_SOURCES =    \
 monodis_LDADD =                        \
        libmonodis.a                    \
        $(runtime_lib)                  \
-       $(GMODULE_LIBS)                 \
-       $(GLIB_LIBS) 
+       $(LLVM_LIBS)                    \
+       $(GLIB_LIBS)                    \
+       $(LIBICONV)
+
+if PLATFORM_DARWIN
+monodis_LDFLAGS=-framework CoreFoundation
+endif
 
 man_MANS = monodis.1