(EXTRA_FLAGS): Remove.

(LIBRARY_COMPILE) [!HAVE_SYSTEM_XML]: Use $(BOOT_COMPILE) for
non-Xml first build.
(all-local) [!SECOND_PASS]: Simplify.

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

diff --git a/mcs/class/System/ChangeLog b/mcs/class/System/ChangeLog
index 2b11e0bf196b9c5e964e1c1cdf3c713eaa180e77..7c284326737b8115df2d724a0d477c4e23edb5ad 100644 (file)
--- a/mcs/class/System/ChangeLog
+++ b/mcs/class/System/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-24  Raja R Harinath  <rharinath@novell.com>
+
+       * Makefile (EXTRA_FLAGS): Remove.
+       (LIBRARY_COMPILE) [!HAVE_SYSTEM_XML]: Use $(BOOT_COMPILE) for
+       non-Xml first build.
+       (all-local) [!SECOND_PASS]: Simplify.
+
 2004-05-10  Raja R Harinath  <rharinath@novell.com>
 
        * Makefile (install-local,test-local,run-test-local,clean-local):

diff --git a/mcs/class/System/Makefile b/mcs/class/System/Makefile
index fcb7282faaef1fe200f2675f156c617522fc9b7e..dcdf24c59172d49d9d5b19da39756724be4eda82 100644 (file)
--- a/mcs/class/System/Makefile
+++ b/mcs/class/System/Makefile
@@ -8,7 +8,7 @@ LIBRARY = System.dll
 # 1st pass - build System.dll without System.Xml.dll reference
 # 2nd pass - build System.dll with System.Xml.dll reference
 
-LIB_MCS_FLAGS = /r:$(corlib) $(EXTRA_FLAGS)
+LIB_MCS_FLAGS = /r:$(corlib)
 TEST_MCS_FLAGS = /nowarn:1595 /nowarn:0618
 
 CYCLIC_DEP = System.Xml.dll
@@ -22,13 +22,21 @@ ifdef SECOND_PASS
        include ../../build/library.make
 
 ifdef HAVE_SYSTEM_XML
+
+LIB_MCS_FLAGS += /define:XML_DEP /r:$(CYCLIC_DEP)
+
 $(the_lib): ../lib/$(PROFILE)/$(CYCLIC_DEP)
-endif
 
 else
+
 # First pass:
 #   1. Build temporary System.dll without depending on System.Xml.dll
 #   2. Since mcs.exe depends on System.dll, use BOOT_COMPILE to compile System.dll
+LIBRARY_COMPILE = $(BOOT_COMPILE)
+
+endif
+
+else
 
 test-local: all-local
 
@@ -36,10 +44,10 @@ all-local install-local test-local run-test-local clean-local:
        @set -e; \
        if test ! -f ../lib/$(PROFILE)/$(CYCLIC_DEP) ; then \
            echo "Creating temporary $(LIBRARY) without $(CYCLIC_DEP) reference." ; \
-           $(MAKE) SECOND_PASS=yes CSCOMPILE='$(BOOT_COMPILE)' $@ ; \
+           $(MAKE) SECOND_PASS=yes $@ ; \
            rm -f '$(depsdir)/$(PROFILE)_$(LIBRARY).stamp'; \
        else \
-           $(MAKE) SECOND_PASS=yes HAVE_SYSTEM_XML=yes EXTRA_FLAGS="/define:XML_DEP /r:$(CYCLIC_DEP)" $@ ; \
+           $(MAKE) SECOND_PASS=yes HAVE_SYSTEM_XML=yes $@ ; \
        fi
 
 endif