X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Core%2FMakefile;h=893de76b60b7e0524c5f581e78d02f060bd6f736;hb=f3e4623ee9709a580dbc8d4112fb9558f2c557c3;hp=e9e6a348aeefe9bc8d65d9dfaee63a9228c811d1;hpb=25863a98d3ed8f29109afe815063ca0967bf70b3;p=mono.git

diff --git a/mcs/class/System.Core/Makefile b/mcs/class/System.Core/Makefile
index e9e6a348aee..893de76b60b 100644
--- a/mcs/class/System.Core/Makefile
+++ b/mcs/class/System.Core/Makefile
@@ -4,21 +4,39 @@ include ../../build/rules.make
 
 LIBRARY = System.Core.dll
 
-LIB_MCS_FLAGS = -unsafe -d:LIBC /r:$(corlib) /r:System
+LIB_MCS_FLAGS = -d:LIBC /r:$(corlib) /r:System
 
-ifeq (2.0, $(FRAMEWORK_VERSION))
+ifneq (2.1, $(FRAMEWORK_VERSION))
 LIB_MCS_FLAGS += -d:NET_3_5 -nowarn:1720
 endif
 
+ifeq (4.0, $(FRAMEWORK_VERSION))
+LIB_MCS_FLAGS += -d:CODEPLEX_40
+endif
+
+FULL_PROFILE := $(filter net_2_0 net_4_0 moonlight_raw monotouch, $(PROFILE))
+ifdef FULL_PROFILE
+LIBRARY_COMPILE = $(BOOT_COMPILE)
+endif
+
+ifneq (basic, $(PROFILE))
+CLR_PROFILE := $(filter 2.0 4.0, $(FRAMEWORK_VERSION))
+endif
+
+ifdef CLR_PROFILE
+LIB_MCS_FLAGS += -r:../lib/$(PROFILE)/Mono.Posix -unsafe
+endif
+
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
-# This is a .NET > 2.0 only assembly
-VALID_PROFILE := $(filter net_2_0_bootstrap net_2_0 net_2_1_bootstrap net_2_1_raw, $(PROFILE))
+# This is a .NET 2.0+ only assembly
+VALID_PROFILE := $(filter 2.0 2.1 4.0, $(FRAMEWORK_VERSION))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Core.dll
 NO_INSTALL = yes
 NO_SIGN_ASSEMBLY = yes
 NO_TEST = yes
+NO_BUILD = yes
 endif
 
 include ../../build/library.make