Better build profile check

diff --git a/mcs/class/Mono.Web/Makefile b/mcs/class/Mono.Web/Makefile
index 8fb69efd17aa5e06e3e9b1e2e9bff17736ac36b7..d22c74d2b1c3a1ab2fc798f76a5fc910ecd2a83f 100644 (file)
--- a/mcs/class/Mono.Web/Makefile
+++ b/mcs/class/Mono.Web/Makefile
@@ -7,7 +7,7 @@ LIBRARY = Mono.Web.dll
 NO_TEST = yes
 
 # This is a .NET 2.0+ only assembly
-VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5, $(PROFILE))
+VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR))
 ifdef VALID_PROFILE
 
 LIB_MCS_FLAGS = -r:$(corlib) \

diff --git a/mcs/class/System.Configuration/Makefile b/mcs/class/System.Configuration/Makefile
index 9f27fac08452d5da03f8eccb66416abd88c5cff3..e79a54429044b0f6454b8c1e474a841318a09772 100644 (file)
--- a/mcs/class/System.Configuration/Makefile
+++ b/mcs/class/System.Configuration/Makefile
@@ -8,13 +8,4 @@ LIBRARY_USE_INTERMEDIATE_FILE = yes
 LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -r:System.Xml.dll -r:System.Security.dll -nowarn:618
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
-# This is a .NET 2.0+ only assembly
-VALID_PROFILE := $(filter net_2_0 net_4_0_bootstrap net_4_0 net_4_5, $(PROFILE))
-ifndef VALID_PROFILE
-LIBRARY_NAME = dummy-System.Configuration.dll
-NO_INSTALL = yes
-NO_SIGN_ASSEMBLY = yes
-NO_TEST = yes
-endif
-
 include ../../build/library.make

diff --git a/mcs/class/System.Transactions/Makefile b/mcs/class/System.Transactions/Makefile
index 43ad21adeac6c1e209bc785b5be26c7373fc8bd0..e65451c85ed94ea59f8008399abcc88c26a9e127 100644 (file)
--- a/mcs/class/System.Transactions/Makefile
+++ b/mcs/class/System.Transactions/Makefile
@@ -13,14 +13,4 @@ endif
 
 TEST_MCS_FLAGS = /nowarn:1595 $(LIB_MCS_FLAGS)
 
-# This is a .NET 2.0+ only assembly
-VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5 monotouch monodroid mobile, $(PROFILE))
-ifndef VALID_PROFILE
-LIBRARY_NAME = dummy-System.Transactions.dll
-NO_INSTALL = yes
-NO_SIGN_ASSEMBLY = yes
-NO_TEST = yes
-endif
-
-
 include ../../build/library.make