(net_1_1_bootstrap_SUBDIRS): New.

(all.override): Fix to actually perform optimization to avoid
the two-pass build if we are not signing assemblies.

svn path=/trunk/mcs/; revision=35627

diff --git a/mcs/ChangeLog b/mcs/ChangeLog
index 127153be5088ec52b11c25f6641ec4e5439d60a9..395df575b02e525830386b0dd16810d9f5de34d0 100644 (file)
--- a/mcs/ChangeLog
+++ b/mcs/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-04  Raja R Harinath  <rharinath@novell.com>
+
+       * Makefile (net_1_1_bootstrap_SUBDIRS): New.
+       (all.override): Fix to actually perform optimization to avoid
+       the two-pass build if we are not signing assemblies.
+
 2004-10-29  Raja R Harinath  <rharinath@novell.com>
 
        * Makefile (net_2_0_bootstrap_SUBDIRS,net_2_0_SUBDIRS): New.

diff --git a/mcs/Makefile b/mcs/Makefile
index fdb0aa6edc9b03473c3593b35e4214540a9a4188..cdc526c608c8c8e55121d5e487759b33c7cd310e 100644 (file)
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -3,24 +3,26 @@ thisdir := .
 SUBDIRS := build jay mcs monoresgen class mbas nunit20 ilasm tools tests errors docs
 DIST_ONLY_SUBDIRS := gmcs
 
-net_2_0_bootstrap_SUBDIRS := class
+bootstrap_dirs := class
+net_1_1_bootstrap_SUBDIRS := $(bootstrap_dirs)
+net_2_0_bootstrap_SUBDIRS := $(bootstrap_dirs)
 net_2_0_SUBDIRS := gmcs class tests errors tools
 
 ifdef TEST_SUBDIRS
 $(PROFILE)_SUBDIRS := $(TEST_SUBDIRS)
 endif
 
-ifndef NO_SIGN_ASSEMBLIES
 OVERRIDE_TARGET_ALL = yes
-endif
 
 include build/rules.make
 
 all-recursive $(STD_TARGETS:=-recursive): platform-check profile-check
 
-# Used only if OVERRIDE_TARGET_ALL is defined
+# Used when OVERRIDE_TARGET_ALL is defined
 all.override:
+ifndef NO_SIGN_ASSEMBLY
        $(MAKE) NO_SIGN_ASSEMBLY=yes all.real
+endif
        $(MAKE) all.real
 
 .PHONY: all-local $(STD_TARGETS:=-local)