* library.make (HAVE_CS_TESTS, HAVE_VB_TESTS): Allow to be

overriden.  Useful if the tests sourcefile is generated.

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

diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index c15ffc2c0fb498191456fe7fbf91a62d47526d50..2ad926bf79c7111aedb3fdb1cffd1e3bd7846cdd 100644 (file)
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -1,5 +1,8 @@
 2004-06-11  Raja R Harinath  <rharinath@novell.com>
 
+       * library.make (HAVE_CS_TESTS, HAVE_VB_TESTS): Allow to be
+       overriden.  Useful if the tests sourcefile is generated.
+
        * platforms/win32.make (PLATFORM_TWEAK_CORLIB_SOURCES): Remove.
 
        Support enough features to build mscorlib.dll.

diff --git a/mcs/build/library.make b/mcs/build/library.make
index ba66502aff1faa7fe69452c7423c1f1d36f813bd..d2df47166370561434776f2389d543646675729e 100644 (file)
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -14,7 +14,7 @@ PLATFORM_excludes := $(wildcard $(LIBRARY).$(PLATFORM)-excludes)
 ifdef PLATFORM_excludes
 sourcefile = $(depsdir)/$(LIBRARY).$(PLATFORM)-sources
 $(sourcefile): $(core_sourcefile) $(PLATFORM_excludes)
-       sort $(core_sourcefile) $(PLATFORM_excludes) | uniq -u >$@
+       cat $(core_sourcefile) $(PLATFORM_excludes) | sort | uniq -u >$@
 else
 sourcefile = $(core_sourcefile)
 endif
@@ -63,8 +63,12 @@ btest_response = $(depsdir)/$(btest_lib).response
 btest_makefrag = $(depsdir)/$(btest_lib).makefrag
 btest_flags = /r:$(test_against) $(test_nunit_ref) $(TEST_MBAS_FLAGS)
 
-HAVE_CS_TESTS := $(wildcard $(test_sourcefile))
+ifndef HAVE_CS_TESTS
+HAVE_CS_TESTS := $(wildcard $(btest_sourcefile))
+endif
+ifndef HAVE_VB_TESTS
 HAVE_VB_TESTS := $(wildcard $(btest_sourcefile))
+endif
 
 endif