(mcs-do-basic-build, mcs-do-short-build):

Pass NO_SIGN_ASSEMBLY=yes to sub-make.
($(tmpinst)/bin/mono) [PLATFORM_WIN32]: Make it work.

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

diff --git a/ChangeLog b/ChangeLog
index fd01b8717b47e0825eea0d9628bfe80ab6f705ed..1a631ba75b6c55af58e1ae3073be826f60beab53 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-02  Raja R Harinath  <rharinath@novell.com>
+
+       * Makefile.am (mcs-do-basic-build, mcs-do-short-build):
+       Pass NO_SIGN_ASSEMBLY=yes to sub-make.
+       ($(tmpinst)/bin/mono) [PLATFORM_WIN32]: Make it work.
+
 2004-07-02  Zoltan Varga  <vargaz@freemail.hu>
 
        * man/mono.1: Added 'aot' to trace options.

diff --git a/Makefile.am b/Makefile.am
index eaa4952f2ce93022fb74c0b1e4dd42027b8a290d..4a0d5a4c42eccbdb4d608c3d864870b2a95e594b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -118,14 +118,14 @@ mono-do-runtime-only: $(CONFIG_HEADER)
 mcs-do-basic-build:
        rm -f $(MCS_FILES)
        for dir in $(MCS_BASIC_DIRS); do \
-         (cd $(mcs_topdir)/$$dir && $(MAKE) PROFILE=default USE_BOOT_COMPILE=yes BOOTSTRAP_MCS="mcs -d:BOOTSTRAP_WITH_OLDLIB") || exit 1 ; \
+         (cd $(mcs_topdir)/$$dir && $(MAKE) PROFILE=default NO_SIGN_ASSEMBLY=yes USE_BOOT_COMPILE=yes BOOTSTRAP_MCS="mcs -d:BOOTSTRAP_WITH_OLDLIB") || exit 1 ; \
        done
 
 mcs-do-short-build:
        tmpinst=`cd $(tmpinst) && pwd` ; \
        PATH=$$tmpinst/bin:$$PATH; export PATH ; \
        for dir in $(MCS_DIRS); do \
-         (cd $(mcs_topdir)/$$dir && $(MAKE) PROFILE=default) || exit 1 ; \
+         (cd $(mcs_topdir)/$$dir && $(MAKE) PROFILE=default NO_SIGN_ASSEMBLY=yes) || exit 1 ; \
        done
 
 mcs-do-full-build:
@@ -170,7 +170,7 @@ $(tmpinst)/bin/mono: $(srcdir)/Makefile.am
        echo 'if test -z "$$MONO_PATH" ; then MONO_PATH="$$tmpinst\\lib"; else MONO_PATH="$${MONO_PATH};$$tmpinst\\lib" ; fi' >> $@
        echo 'MONO_CFG_DIR="$$tmpinst\\etc"' >> $@
        echo 'export MONO_PATH MONO_CFG_DIR' >> $@
-       echo 'exec "$$builddir/libtool" --mode=execute "$$builddir/mono.exe" "$$@"' >> $@
+       echo 'exec "$$builddir/libtool" --mode=execute "$$builddir/$(mono_runtime).exe" "$$@"' >> $@
        chmod +x $@
 
 else