Author: benm
Date: 2005-04-23 14:58:08 -0400 (Sat, 23 Apr 2005)
New Revision: 43502
Modified:
trunk/mcs/build/ChangeLog
trunk/mcs/build/profiles/basic.make
Log:
2005-04-23 Ben Maurer <[EMAIL PROTECTED]>
* profiles/basic.make: Ensure that make dist works even if you
only have an old mono rpm installed. Essential for the new build
system.
Modified: trunk/mcs/build/ChangeLog
===================================================================
--- trunk/mcs/build/ChangeLog 2005-04-23 18:38:25 UTC (rev 43501)
+++ trunk/mcs/build/ChangeLog 2005-04-23 18:58:08 UTC (rev 43502)
@@ -1,3 +1,9 @@
+2005-04-23 Ben Maurer <[EMAIL PROTECTED]>
+
+ * profiles/basic.make: Ensure that make dist works even if you
+ only have an old mono rpm installed. Essential for the new build
+ system.
+
2005-04-21 Raja R Harinath <[EMAIL PROTECTED]>
* rules.make (INTERNAL_ILASM): Update.
Modified: trunk/mcs/build/profiles/basic.make
===================================================================
--- trunk/mcs/build/profiles/basic.make 2005-04-23 18:38:25 UTC (rev 43501)
+++ trunk/mcs/build/profiles/basic.make 2005-04-23 18:58:08 UTC (rev 43502)
@@ -1,7 +1,24 @@
# -*- makefile -*-
BOOTSTRAP_MCS = $(EXTERNAL_MCS)
+
+#
+# If we are bootstrapping with an external mono -- for example, trying
+# to do `make basic' with an old mono RPM, we need to make sure that we don't
+# set MONO_PATH for an old runtime -- otherwise it will get a new corlib and
+# be fscked up. We do this by testing if the first word of runtime is the same
+# as external runtime -- if so, we make sure not to set the MONO_PATH on mcs.
+#
+
+ifeq ($(word 1, $(RUNTIME)),$(EXTERNAL_RUNTIME))
+USING_EXT_MONO = yes
+endif
+
+ifdef USING_EXT_MONO
+MCS = $(EXTERNAL_MCS)
+else
MCS =
MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
$(INTERNAL_MCS)
+endif
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:ONLY_1_1 -d:BOOTSTRAP_WITH_OLDLIB
NO_SIGN_ASSEMBLY = yes
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
