[nullgc] When building nullgc, don't try to link Boehm libs

Previous nullgc commit (52d9a55a861527ed4027f8e10a97e3cc880baf4a) didn't actually work in a clean tree.

diff --git a/configure.ac b/configure.ac
index b47b2f254b2813f14ed92f857c263a746ca20746..3c3e617d759d8ae4538f4c0558d673d5725b1478 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1336,6 +1336,7 @@ if test "x$support_boehm" = "xyes"; then
        AC_SUBST(BOEHM_DEFINES)
 
 fi
+AM_CONDITIONAL(SUPPORT_NULLGC, test "x$libgc" = "xnone")
 
 dnl
 dnl End of Boehm GC Configuration

diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in
index b2107a6c524d8a33b267af7af06c601020fa2caf..427956296ab3d03998acbb2b8dc49b09b3b49670 100755 (executable)
--- a/mono/mini/Makefile.am.in
+++ b/mono/mini/Makefile.am.in
@@ -10,8 +10,13 @@ PLATFORM_PATH_SEPARATOR=:
 endif
 
 # This is needed for automake dependency generation
+if SUPPORT_NULLGC
+libgc_libs=
+libgc_static_libs=
+else
 libgc_libs=$(monodir)/libgc/libmonogc.la
 libgc_static_libs=$(monodir)/libgc/libmonogc-static.la
+endif
 
 boehm_libs=    \
        $(monodir)/mono/metadata/libmonoruntime.la      \