Fix resgen build order

diff --git a/mcs/Makefile b/mcs/Makefile
index 99d143abf37296a80e666028ecf9bd7b7ca6c597..90b8172b3a9a8e8cbddf0c4d38e5d45c8ffbcfcf 100644 (file)
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -3,13 +3,13 @@ thisdir := .
 SUBDIRS := build jay mcs class nunit24 ilasm tools tests errors docs
 
 basic_SUBDIRS := build jay mcs class tools
-net_2_0_SUBDIRS := build class nunit24 ilasm tools tests errors mcs
+net_2_0_SUBDIRS := build tools/resgen tools/culevel class nunit24 ilasm tools tests errors mcs
 moonlight_raw_SUBDIRS := build class tools mcs
 moonlight_SUBDIRS := tools
 monodroid_SUBDIRS := build class mcs
 monotouch_SUBDIRS := build class mcs
 net_3_5_SUBDIRS := build class tools/xbuild
-net_4_0_SUBDIRS := build class nunit24 ilasm tools tests errors docs mcs
+net_4_0_SUBDIRS := build tools/resgen tools/culevel class nunit24 ilasm tools tests errors docs mcs
 
 # List of test subdirs that should pass 100%
 centum_tests := \

diff --git a/mcs/build/profiles/net_2_0.make b/mcs/build/profiles/net_2_0.make
index 796c78290e6eb7a5ebb72765f6a5770c3583c18c..0f79ea0f764975a7f0b3b3a3d13685169be15eac 100644 (file)
--- a/mcs/build/profiles/net_2_0.make
+++ b/mcs/build/profiles/net_2_0.make
@@ -1,7 +1,6 @@
 # -*- makefile -*-
 
 BOOTSTRAP_PROFILE = basic
-BUILD_TOOLS_PROFILE = net_2_0
 BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
 MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
 

diff --git a/mcs/build/rules.make b/mcs/build/rules.make
index 5ba5d649d791f35e10031cda21d55258c3e78d07..da82cbf0220bab8638816894a41bf200a4bc40af 100644 (file)
--- a/mcs/build/rules.make
+++ b/mcs/build/rules.make
@@ -42,7 +42,7 @@ INTERNAL_ILASM = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/ilas
 corlib = mscorlib.dll
 
 ifndef BUILD_TOOLS_PROFILE
-BUILD_TOOLS_PROFILE = $(BOOTSTRAP_PROFILE)
+BUILD_TOOLS_PROFILE = $(PROFILE)
 endif
 
 INTERNAL_RESGEN = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/resgen.exe