In .:

2010-03-03  Rolf Bjarne Kvinge  <RKvinge@novell.com>

	* Makefile: Make basic the bootstrapping profile for net_2_1_bootstrap.

In build:
2010-03-03  Rolf Bjarne Kvinge  <RKvinge@novell.com>

	* profiles/net_2_1_bootstrap.make: Make 'basic' the bootstrapping
	profile for net_2_1_bootstrap.

In mcs:
2010-03-03  Rolf Bjarne Kvinge  <RKvinge@novell.com>

	* Makefile: We need to use the internal bootstrapping gmcs for
	net_2_1_bootstrap too now.

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

diff --git a/mcs/ChangeLog b/mcs/ChangeLog
index f1e9706d4d1787e6d1857119feb65ebb85c2292b..e4e31b255d435219d05397a30479a7dad97561a4 100644 (file)
--- a/mcs/ChangeLog
+++ b/mcs/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-03  Rolf Bjarne Kvinge  <RKvinge@novell.com>
+
+       * Makefile: Make basic the bootstrapping profile for net_2_1_bootstrap.
+
 2010-03-03  Atsushi Enomoto  <atsushi@ximian.com>
 
        * docs/Makefile : drop Mono.Data.SqliteClient.

diff --git a/mcs/Makefile b/mcs/Makefile
index 1bf3a86bc54d1ffda95cf63b8d4b6fcccbd409a6..b30f44ec5df9b14914ef0d62b7ecb746c7c37c0e 100644 (file)
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -110,7 +110,7 @@ $(_boot_:%=profile-do--net_2_1--%):           profile-do--net_2_1--%:
 $(_boot_:%=profile-do--monotouch--%):         profile-do--monotouch--%:         profile-do--monotouch_bootstrap--%
 $(_boot_:%=profile-do--monotouch_bootstrap--%): profile-do--monotouch_bootstrap--%: profile-do--net_2_0--%
 $(_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_1_bootstrap--%): profile-do--net_2_1_bootstrap--%: profile-do--basic--%
 $(_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--basic--%
 

diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index 8dd1464183c58abdcc82ef5a6bf089fec909e39b..6a4649681037f387a6881c8941bc1f85d1b11145 100644 (file)
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-03  Rolf Bjarne Kvinge  <RKvinge@novell.com>
+
+       * profiles/net_2_1_bootstrap.make: Make 'basic' the bootstrapping
+       profile for net_2_1_bootstrap.
+
 2010-02-27  Raja R Harinath  <harinath@hurrynot.org>
 
        * rules.make (all-local $(STD_TARGETS:=-local)): Add empty targets.
@@ -1275,4 +1280,3 @@ Fri Nov 24 18:38:31 CET 2006 Paolo Molaro <lupus@ximian.com>
 
        * Created. See ../ChangeLog for entries earlier than
        this.
-

diff --git a/mcs/build/profiles/net_2_1_bootstrap.make b/mcs/build/profiles/net_2_1_bootstrap.make
index be05dd874529c529bce8f9b8b6a18aa55e2b2f3d..230c3918983d48b80c1348ac437255a34aa693bb 100644 (file)
--- a/mcs/build/profiles/net_2_1_bootstrap.make
+++ b/mcs/build/profiles/net_2_1_bootstrap.make
@@ -2,7 +2,7 @@
 
 INTERNAL_SMCS = $(RUNTIME) $(RUNTIME_FLAGS) --security=temporary-smcs-hack $(topdir)/class/lib/$(PROFILE)/smcs.exe
 
-BOOTSTRAP_PROFILE = net_2_0
+BOOTSTRAP_PROFILE = basic
 BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
 MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_SMCS)
 

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 0e3e85acaabaea018cfb054c69c4d8db91b390fb..2c2b0d00dad80348eb816cccb27162e13dbd813b 100644 (file)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-03  Rolf Bjarne Kvinge  <RKvinge@novell.com>
+
+       * Makefile: We need to use the internal bootstrapping gmcs for
+       net_2_1_bootstrap too now.
+
 2010-03-02  Raja R Harinath  <harinath@hurrynot.org>
 
        * expression.cs (IndexerAccess.ResolveAccessor): Add CS1540 check.

diff --git a/mcs/mcs/Makefile b/mcs/mcs/Makefile
index e2a9785c660eae8bdd43cc2c1aa509affb539f88..6d496c57f5e2d2146558e4047f81b38aac7b6c78 100644 (file)
--- a/mcs/mcs/Makefile
+++ b/mcs/mcs/Makefile
@@ -18,6 +18,10 @@ ifeq (net_2_0, $(PROFILE))
 INTERNAL_GMCS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BOOTSTRAP_PROFILE)/gmcs.exe
 endif
 
+ifeq (net_2_1_bootstrap, $(PROFILE))
+INTERNAL_GMCS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BOOTSTRAP_PROFILE)/gmcs.exe
+endif
+
 ifeq (2.1, $(FRAMEWORK_VERSION))
 LOCAL_MCS_FLAGS += -d:SMCS_SOURCE
 COMPILER_NAME = smcs