2010-05-28 Marek Safar <marek.safar@gmail.com>

	* library.make: Don't sort source input files on windows to
	build metadata compatible assemblies on all platforms.

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

diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index c60dbb3aa179203a82add1a183ebef32ec3802b3..2df42c2c39b1c1b9dda2589e8d230d3df35273b0 100644 (file)
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-28  Marek Safar  <marek.safar@gmail.com>
+
+       * library.make: Don't sort source input files on windows to
+       build metadata compatible assemblies on all platforms.
+
 2010-04-16  Raja R Harinath  <harinath@hurrynot.org>
 
        * profiles/net_4_0_bootstrap.make (PROFILE_MCS_HAS_BOOTSTRAP_FALLBACK):

diff --git a/mcs/build/library.make b/mcs/build/library.make
index 7bf697ed1c7d09b90f46b735edb2ef41b1c5fc07..f5d7ffd767bad30e1fec5a6ec3122f50da8f350c 100644 (file)
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -258,9 +258,17 @@ $(makefrag): $(sourcefile)
           echo '$(sourcefile).makefrag:' >> $@; fi
 
 ifneq ($(response),$(sourcefile))
+
+ifdef PLATFORM_excludes
 $(response): $(sourcefile) $(PLATFORM_excludes)
-       @echo Creating $@ ...
+       @echo Filtering $(sourcefile) to $@ ...
        @sort $(sourcefile) $(PLATFORM_excludes) | uniq -u | $(PLATFORM_CHANGE_SEPARATOR_CMD) >$@
+else
+$(response): $(sourcefile)
+       @echo Converting $(sourcefile) to $@ ...
+       @cat $(sourcefile) | $(PLATFORM_CHANGE_SEPARATOR_CMD) >$@
+endif
+       
 endif
 
 -include $(makefrag)