diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2004-05-24 13:33:14 +0400 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2004-05-24 13:33:14 +0400 |
| commit | 785d0c945746cd49add7332e8cbce8116b2944d6 (patch) | |
| tree | 778a497f2da65076e35aa4ea43e3f364a1b1d08b /mcs/class/System/Makefile | |
| parent | b2566b11267a2d74ad081a39dfc42122541e15cb (diff) | |
(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
Diffstat (limited to 'mcs/class/System/Makefile')
| -rw-r--r-- | mcs/class/System/Makefile | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/mcs/class/System/Makefile b/mcs/class/System/Makefile index fcb7282faae..dcdf24c5917 100644 --- 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 |