Merge pull request #61 from ztzg/darwin-static-build-fixes

Darwin/static build fixes

diff --git a/configure.in b/configure.in
index fdc1e077174ec7cbc8dd6fcc0056968bcf371bf6..a1d17b3b74a83eea9d6db4fb5584665f4bb610e6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2886,7 +2886,7 @@ fi
 # When --disable-shared is used, libtool transforms libmono-2.0.la into libmono-2.0.so
 # instead of libmono-static.a
 if test "x$enable_shared" = "xno"; then
-   LIBMONO_LA=.libs/libmono-static.a
+   LIBMONO_LA=libmini-static.la
 else
    LIBMONO_LA=libmono-$API_VER.la
 fi

diff --git a/mono/dis/Makefile.am b/mono/dis/Makefile.am
index 9c397f4e41bb1c6c689dc5efe2ee8404efc33aaa..1fa0c43e8b0f781fee5c53b0a86442a30a166357 100644 (file)
--- a/mono/dis/Makefile.am
+++ b/mono/dis/Makefile.am
@@ -5,7 +5,18 @@ export HOST_CC
 endif
 
 if JIT_SUPPORTED
+if !SHARED_MONO
+static_libs=   \
+       $(top_builddir)/mono/metadata/libmonoruntime-static.la  \
+       $(top_builddir)/mono/io-layer/libwapi.la        \
+       $(top_builddir)/mono/utils/libmonoutils.la \
+       $(GLIB_LIBS) $(LIBICONV) \
+       $(LIBGC_STATIC_LIBS)
+
+runtime_lib=../mini/$(LIBMONO_LA) $(static_libs)
+else
 runtime_lib=../mini/$(LIBMONO_LA)
+endif
 else
 runtime_lib=../interpreter/libmint.la
 endif

diff --git a/mono/monograph/Makefile.am b/mono/monograph/Makefile.am
index acabade04a8f3e21cb0ad67247178d81d6cc9752..d6989d9041bb9910c88b38257c858b3584ec8a2b 100644 (file)
--- a/mono/monograph/Makefile.am
+++ b/mono/monograph/Makefile.am
@@ -4,7 +4,18 @@ export HOST_CC
 endif
 
 if JIT_SUPPORTED
+if !SHARED_MONO
+static_libs=   \
+       $(top_builddir)/mono/metadata/libmonoruntime-static.la  \
+       $(top_builddir)/mono/io-layer/libwapi.la        \
+       $(top_builddir)/mono/utils/libmonoutils.la \
+       $(GLIB_LIBS) $(LIBICONV) \
+       $(LIBGC_STATIC_LIBS)
+
+runtime_lib=../mini/$(LIBMONO_LA) $(static_libs)
+else
 runtime_lib=../mini/$(LIBMONO_LA)
+endif
 else
 runtime_lib=../interpreter/libmint.la
 endif

diff --git a/mono/profiler/Makefile.am b/mono/profiler/Makefile.am
index 4577fc9a9f8d5cafadc123328851bd3d69fa5125..93a323c55b6a0c9a747357c5d8e14b4b8244f4a9 100644 (file)
--- a/mono/profiler/Makefile.am
+++ b/mono/profiler/Makefile.am
@@ -24,7 +24,18 @@ if HAVE_OPROFILE
 endif
 
 if SUPPORT_BOEHM
-LIBMONO=$(top_builddir)/mono/mini/libmono-$(API_VER).la
+if !SHARED_MONO
+static_libs=   \
+       $(top_builddir)/mono/metadata/libmonoruntime-static.la  \
+       $(top_builddir)/mono/io-layer/libwapi.la        \
+       $(top_builddir)/mono/utils/libmonoutils.la \
+       $(GLIB_LIBS) $(LIBICONV) \
+       $(LIBGC_STATIC_LIBS)
+
+LIBMONO=$(top_builddir)/mono/mini/$(LIBMONO_LA) $(static_libs)
+else
+LIBMONO=$(top_builddir)/mono/mini/$(LIBMONO_LA)
+endif
 else
 LIBMONO=$(top_builddir)/mono/mini/libmonosgen-$(API_VER).la
 endif