Ensure the linker can eliminate most CAS-related types in the MOBILE-based profiles

[mono.git] / mcs / class / corlib / Makefile

diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile
index 5c99b77bd0103b6a903ff6ce839fb31981de42a7..5c1e87326d0a47af57de029955ad737b730e956e 100644 (file)
--- a/mcs/class/corlib/Makefile
+++ b/mcs/class/corlib/Makefile
@@ -8,8 +8,20 @@ LIBRARY_NAME = mscorlib.dll
 LIB_MCS_FLAGS = $(RESOURCE_FILES:%=-resource:%)
 LIBRARY_USE_INTERMEDIATE_FILE = yes
 
-ifeq (4.0, $(FRAMEWORK_VERSION))
+ifeq (basic, $(PROFILE))
+
+else
+
+ifeq (2, $(FRAMEWORK_VERSION_MAJOR))
+LIB_MCS_FLAGS += --runtime:v2
+else
+ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
 LIB_MCS_FLAGS += --runtime:v4
+else
+$(error Unknown framework version)
+endif
+endif
+
 endif
 
 LIBRARY_COMPILE = $(BOOT_COMPILE)
@@ -80,23 +92,36 @@ endif
 
 vts = VersionTolerantSerialization
 vtsdir = Test/System.Runtime.Serialization.Formatters.Binary/$(vts)
-test-vts:
-       $(MCS) -target:library \
-               $(vtsdir)/$(vts)TestLib/1.0/Address.cs
-       $(MCS) $(test_nunit_ref) \
+vtslibs = \
+       $(vtsdir)/$(vts)TestLib/1.0/Address.dll \
+       $(vtsdir)/$(vts)TestLib/2.0/Address.dll \
+       $(vtsdir)/$(vts)TestLib/3.0/Address.dll \
+       $(vtsdir)/$(vts)TestLib/4.0/Address.dll \
+       $(vtsdir)/$(vts)TestLib/5.0/Address.dll \
+       $(vtsdir)/$(vts)TestLib/6.0/Address.dll
+
+test-vts: $(vtslibs) $(vtsdir)/BinarySerializationOverVersions.exe
+
+$(vtsdir)/$(vts)TestLib/%/Address.dll: $(vtsdir)/$(vts)TestLib/%/Address.cs
+       $(Q_MCS) $(MCS) -target:library -warn:0  $^
+
+$(vtsdir)/BinarySerializationOverVersions.exe: $(vtsdir)/BinarySerializationOverVersions.cs $(vtsdir)/$(vts)TestLib/1.0/Address.dll
+       $(Q_MCS) $(MCS) $(test_nunit_ref) -warn:0  \
                -r:$(vtsdir)/$(vts)TestLib/1.0/Address.dll \
                $(vtsdir)/BinarySerializationOverVersions.cs
-       cp $(vtsdir)/$(vts)TestLib/1.0/Address.dll $(vtsdir)
-       $(MCS) -target:library \
-               $(vtsdir)/$(vts)TestLib/2.0/Address.cs
-       $(MCS) -target:library \
-               $(vtsdir)/$(vts)TestLib/3.0/Address.cs
-       $(MCS) -target:library \
-               $(vtsdir)/$(vts)TestLib/4.0/Address.cs
-       $(MCS) -target:library \
-               $(vtsdir)/$(vts)TestLib/5.0/Address.cs
+       @cp $(vtsdir)/$(vts)TestLib/1.0/Address.dll $(vtsdir)
+
 run-test-vts: test-vts
+       @echo Running vts tests...
        $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(TEST_HARNESS) -noshadow \
                $(vtsdir)/BinarySerializationOverVersions.exe 
 test: test-vts
 run-test: run-test-vts
+
+EXTRA_DISTFILES += \
+       $(vtsdir)/$(vts)TestLib/1.0/Address.cs \
+       $(vtsdir)/$(vts)TestLib/2.0/Address.cs \
+       $(vtsdir)/$(vts)TestLib/3.0/Address.cs \
+       $(vtsdir)/$(vts)TestLib/4.0/Address.cs \
+       $(vtsdir)/$(vts)TestLib/5.0/Address.cs \
+       $(vtsdir)/BinarySerializationOverVersions.cs