Improve coarse-grain parallelism in the build

* Makefile (_boot_:net_2_0_bootstrap): Depend on
'net_1_1_bootstrap' profile, rather than 'net_1_1'.
* build/profiles/net_2_0_bootstrap.make (BOOTSTRAP_PROFILE): Set to
net_1_1_bootstrap instead of net_1_1.

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

diff --git a/mcs/ChangeLog b/mcs/ChangeLog
index f072feb192c91a8f8289cf6fbdfaf9153b17390c..3cf757e4620012c8c03b1de62822b706311a4565 100644 (file)
--- a/mcs/ChangeLog
+++ b/mcs/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-16  Raja R Harinath  <harinath@hurrynot.org>
+
+       Improve coarse-grain parallelism in the build
+       * Makefile (_boot_:net_2_0_bootstrap): Depend on
+       'net_1_1_bootstrap' profile, rather than 'net_1_1'.
+
 2009-07-10  Atsushi Enomoto  <atsushi@ximian.com>
 
        * nunit20 : removed old framework.

diff --git a/mcs/Makefile b/mcs/Makefile
index d7d430296be25be9d6f789da952f7ffc0429a925..2c41d19422542526d321d8324751da2f769b1460 100644 (file)
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -105,7 +105,7 @@ $(_boot_:%=profile-do--net_2_1--%):           profile-do--net_2_1--%:
 $(_boot_:%=profile-do--net_2_1_raw--%):       profile-do--net_2_1_raw--%:       profile-do--net_2_1_bootstrap--%
 $(_boot_:%=profile-do--net_2_1_bootstrap--%): profile-do--net_2_1_bootstrap--%: profile-do--net_2_0--%
 $(_boot_:%=profile-do--net_2_0--%):           profile-do--net_2_0--%:           profile-do--net_2_0_bootstrap--%
-$(_boot_:%=profile-do--net_2_0_bootstrap--%): profile-do--net_2_0_bootstrap--%: profile-do--net_1_1--%
+$(_boot_:%=profile-do--net_2_0_bootstrap--%): profile-do--net_2_0_bootstrap--%: profile-do--net_1_1_bootstrap--%
 $(_boot_:%=profile-do--net_1_1--%):           profile-do--net_1_1--%:           profile-do--net_1_1_bootstrap--%
 $(_boot_:%=profile-do--net_1_1_bootstrap--%): profile-do--net_1_1_bootstrap--%: profile-do--basic--%
 

diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index c875de4b20a53b6b8fe36a436e1b5dd8f818f2c0..d2233f5bb63c0afd1c41be739aef83a2d6286c61 100644 (file)
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-16  Raja R Harinath  <harinath@hurrynot.org>
+
+       * profiles/net_2_0_bootstrap.make (BOOTSTRAP_PROFILE): Set to
+       net_1_1_bootstrap instead of net_1_1.
+
 2009-06-03  Zoltan Varga  <vargaz@gmail.com>
 
        * profiles/net_4_0.make: Add preliminary net 4.0 profile.

diff --git a/mcs/build/profiles/net_2_0_bootstrap.make b/mcs/build/profiles/net_2_0_bootstrap.make
index 62a99351dd6ad116fb60be05e5e1191001b433eb..c60c6d5fd01fce39bdecc9c7b70fe0d0d3a3dfb5 100644 (file)
--- a/mcs/build/profiles/net_2_0_bootstrap.make
+++ b/mcs/build/profiles/net_2_0_bootstrap.make
@@ -4,7 +4,7 @@
 # Note that we're using the .NET 1.1 MCS but MONO_PATH points to the net_2_0_bootstrap directory.
 # We do it this way to get assembly version references right.
 #
-BOOTSTRAP_PROFILE = net_1_1
+BOOTSTRAP_PROFILE = net_1_1_bootstrap
 BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BOOTSTRAP_PROFILE)/mcs.exe
 MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/gmcs.exe