(HAVE_CYCLIC_DEP_FILE): New. Used to detect if

System.Xml.dll is present.
(SECOND_PASS): Remove.

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

1 files changed, 13 insertions, 23 deletions

diff --git a/mcs/class/System/Makefile b/mcs/class/System/Makefile
index 35b3c36b800..96b36c920ca 100644
--- a/mcs/class/System/Makefile
+++ b/mcs/class/System/Makefile
@@ -11,22 +11,17 @@ LIBRARY = System.dll
 LIB_MCS_FLAGS = /r:$(corlib)
 TEST_MCS_FLAGS = /nowarn:1595 /nowarn:0618
 
-CYCLIC_DEP = System.Xml.dll
+CYCLIC_DEP := System.Xml.dll
+CYCLIC_DEP_FILE := ../lib/$(PROFILE)/$(CYCLIC_DEP)
+HAVE_CYCLIC_DEP_FILE := $(wildcard $(CYCLIC_DEP_FILE))
 
 EXTRA_DISTFILES = \
 	System.Text.RegularExpressions/notes.txt	\
 	System.ComponentModel.Design/Changelog		\
 	Test/test-config-file
 
-ifdef SECOND_PASS
-	include ../../build/library.make
-
-ifdef HAVE_SYSTEM_XML
-
+ifdef HAVE_CYCLIC_DEP_FILE
 LIB_MCS_FLAGS += /define:XML_DEP /r:$(CYCLIC_DEP)
-
-$(the_lib): ../lib/$(PROFILE)/$(CYCLIC_DEP)
-
 else
 
 # First pass:
@@ -36,18 +31,13 @@ LIBRARY_COMPILE = $(BOOT_COMPILE)
 
 endif
 
-else
+include ../../build/library.make
 
-test-local: all-local
-
-all-local install-local test-local run-test-local run-test-ondotnet-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 $@ ; \
-	    rm -f '$(depsdir)/$(PROFILE)_$(LIBRARY).stamp'; \
-	else \
-	    $(MAKE) SECOND_PASS=yes HAVE_SYSTEM_XML=yes $@ ; \
-	fi
-
-endif
+ifdef HAVE_CYCLIC_DEP_FILE
+$(the_lib): $(CYCLIC_DEP_FILE)
+else
+$(the_lib): echo-warning
+.PHONY: echo-warning
+echo-warning:
+	@echo "** Building temporary System.dll without parts that depend on System.Xml"
+endif
\ No newline at end of file