Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
(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
  • Loading branch information
harinath committed May 24, 2004
1 parent b2566b1 commit 785d0c9
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 4 deletions.
7 changes: 7 additions & 0 deletions 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):
Expand Down
16 changes: 12 additions & 4 deletions mcs/class/System/Makefile
Expand Up @@ -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
Expand All @@ -22,24 +22,32 @@ 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

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

0 comments on commit 785d0c9

Please sign in to comment.