Merge pull request #952 from ermshiperete/bug-xamarin-2912

[mono.git] / mcs / class / System.Xml.Linq / Makefile

diff --git a/mcs/class/System.Xml.Linq/Makefile b/mcs/class/System.Xml.Linq/Makefile
index ab18cf6395f2c715b0a6e9ec7c339b4fa32e0345..65bdd81ee2f0851f855eac97c0f9351c0ed24701 100644 (file)
--- a/mcs/class/System.Xml.Linq/Makefile
+++ b/mcs/class/System.Xml.Linq/Makefile
@@ -4,21 +4,20 @@ include ../../build/rules.make
 
 LIBRARY = System.Xml.Linq.dll
 LIB_MCS_FLAGS = \
-               /langversion:linq \
-               /r:System.dll \
-               /r:System.Core.dll \
-               /r:System.Xml.dll
+               -r:System.dll \
+               -r:System.Core.dll \
+               -r:System.Xml.dll
 
-ifeq (2.0, $(FRAMEWORK_VERSION))
-LIB_MCS_FLAGS += -d:NET_3_5
+ifneq (2.1, $(FRAMEWORK_VERSION))
+# This is a .NET 3.5+ only assembly, but built during the 2.0 build
+LIB_MCS_FLAGS += -d:NET_3_5 -nowarn:1720
 endif
 
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 EXTRA_DISTFILES =
 
-# This is a .NET 3.0 only assembly
-VALID_PROFILE := $(filter net_2_0_bootstrap net_2_0 net_2_1, $(PROFILE))
+VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Xml.Linq.dll
 NO_INSTALL = yes