[monodis] Attempt to fix the Cygwin build.
authorJoão Matos <joao@tritao.eu>
Fri, 13 Feb 2015 12:43:06 +0000 (12:43 +0000)
committerJoão Matos <joao@tritao.eu>
Fri, 13 Feb 2015 12:43:06 +0000 (12:43 +0000)
  CCLD     monodis.exe
../../mono/metadata/.libs/libmonoruntimesgen-static.a(libmonoruntimesgen_static_la-opcodes.o): In function `mono_opcode_name':
/cygdrive/c/projects/mono-817/mono/metadata/opcodes.c:63: multiple definition of `mono_opcode_name'
../mini/.libs/libmonosgen-2.0.dll.a(d001720.o):(.text+0x0): first defined here
collect2: error: ld returned 1 exit status

mono/dis/Makefile.am

index 30dbc0f54c79d91b6a6ac5ae2193c83a89ee3a38..fcf17c001b9ffb9b531f6cec7ce17fa087fb3d8e 100644 (file)
@@ -13,7 +13,6 @@ endif
 
 runtime_lib=   \
        ../mini/$(LIBMONO_LA) \
-       $(metadata_lib) \
        $(top_builddir)/mono/io-layer/libwapi.la        \
        $(top_builddir)/mono/utils/libmonoutils.la \
        $(GLIB_LIBS) $(LIBICONV) \