2004-08-14 Ben Maurer <bmaurer@ximian.com>

	* Makefile.am: static link on x86 (r=zoltan)

svn path=/trunk/mono/; revision=32339

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index cdfd89f419347c00d44c3a5d3e398fecf15d1225..46e098699318fa110b4fc2d6ab6364b3c83dc788 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-14 Ben Maurer  <bmaurer@ximian.com>
+
+       * Makefile.am: static link on x86 (r=zoltan)
+
 2004-08-14  Zoltan Varga  <vargaz@freemail.hu>
 
        * tramp-amd64.c (amd64_magic_trampoline): Avoid patching the trampoline

diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am
index 58893990f126639f4a0e7fbb99230235a663be90..7ad8f575b51a4f5069a5c8c1e378fda9c44fe2b1 100644 (file)
--- a/mono/mini/Makefile.am
+++ b/mono/mini/Makefile.am
@@ -52,9 +52,13 @@ if AMD64
 # Link libmono into mono statically on platforms where it is possible
 # This leads to higher performance, especially with TLS
 MONO_LIB=.libs/libmono.a
+else 
+if X86
+MONO_LIB=.libs/libmono.a
 else
 MONO_LIB=libmono.la
 endif
+endif
 
 mono_LDADD = \
        $(MONO_LIB)                     \