Author: marek
Date: 2005-07-25 10:23:10 -0400 (Mon, 25 Jul 2005)
New Revision: 47653
Modified:
trunk/mcs/class/corlib/ChangeLog
trunk/mcs/class/corlib/Makefile
Log:
2005-07-25 Marek Safar <[EMAIL PROTECTED]>
* Makefile: `if' for 2.0 warnings only.
Modified: trunk/mcs/class/corlib/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/ChangeLog 2005-07-25 14:11:24 UTC (rev 47652)
+++ trunk/mcs/class/corlib/ChangeLog 2005-07-25 14:23:10 UTC (rev 47653)
@@ -1,3 +1,7 @@
+2005-07-25 Marek Safar <[EMAIL PROTECTED]>
+
+ * Makefile: `if' for 2.0 warnings only.
+
2005-07-11 Marek Safar <[EMAIL PROTECTED]>
* Makefile: Disable warning 414.
Modified: trunk/mcs/class/corlib/Makefile
===================================================================
--- trunk/mcs/class/corlib/Makefile 2005-07-25 14:11:24 UTC (rev 47652)
+++ trunk/mcs/class/corlib/Makefile 2005-07-25 14:23:10 UTC (rev 47653)
@@ -9,8 +9,12 @@
# Here, we define a bunch of variables.
corlib_flags = /unsafe /nostdlib
-LOCAL_MCS_FLAGS = /nowarn:649 /nowarn:169 /nowarn:414 -nowarn:612 -nowarn:618
-d:INSIDE_CORLIB
+LOCAL_MCS_FLAGS = /nowarn:649 /nowarn:169 -nowarn:612 -nowarn:618
-d:INSIDE_CORLIB
+ifneq ($(FRAMEWORK_VERSION),1.0)
+ LOCAL_MCS_FLAGS := $(LOCAL_MCS_FLAGS) /nowarn:414
+endif
+
LIBRARY = corlib.dll
LIBRARY_NAME = mscorlib.dll
LIB_MCS_FLAGS = $(corlib_flags)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
