Fix mono build with disabled sgen (#4915)

Build of the Mono failed with the Boehm GC only (without SGEN)
if it configured like this: --with-gc=included --withsgen=no

diff --git a/mono/dis/Makefile.am b/mono/dis/Makefile.am
index 14090d8c3ecc5d60c50a5d2225e23b0a559b3e47..06085362c54484072e624443e2c11b6a9dc573c3 100644 (file)
--- a/mono/dis/Makefile.am
+++ b/mono/dis/Makefile.am
@@ -8,7 +8,7 @@ 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
+metadata_lib=$(top_builddir)/mono/metadata/libmonoruntime-static.la
 gc_lib=$(LIBGC_STATIC_LIBS)
 endif
 

diff --git a/mono/unit-tests/Makefile.am b/mono/unit-tests/Makefile.am
index b2c969ba0bd0cbfd5a79ecebc4eeb6f8732856cb..ec04c4d1c5f17f5df5dab43b834893dc048783f1 100644 (file)
--- a/mono/unit-tests/Makefile.am
+++ b/mono/unit-tests/Makefile.am
@@ -10,6 +10,7 @@ endif
 if !CROSS_COMPILE
 if !HOST_WIN32
 if SUPPORT_BOEHM
+if SUPPORT_SGEN
 
 noinst_LTLIBRARIES = libtestlib.la
 libtestlib_la_SOURCES =
@@ -54,6 +55,7 @@ check-local:
                echo "</test-case></results></test-suite></test-results>" >> TestResult-unit-tests.xml; \
        fi;
 
+endif SUPPORT_SGEN
 endif SUPPORT_BOEHM
 endif !HOST_WIN32
 endif !CROSS_COMPILE