Merge pull request #409 from Alkarex/patch-1

[mono.git] / mcs / class / System.Core / Makefile

diff --git a/mcs/class/System.Core/Makefile b/mcs/class/System.Core/Makefile
index b5463b1f90615a8902d406bcc7cabff465287860..0b3e9865cf872b893587e3cc262998da24c8de67 100644 (file)
--- a/mcs/class/System.Core/Makefile
+++ b/mcs/class/System.Core/Makefile
@@ -4,36 +4,33 @@ include ../../build/rules.make
 
 LIBRARY = System.Core.dll
 
-LIB_MCS_FLAGS = -d:LIBC /r:$(corlib) /r:System
+LIB_MCS_FLAGS = -d:INSIDE_SYSCORE -d:LIBC /r:System.dll -unsafe
 
 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
+ifeq (monodroid, $(PROFILE))
+LIB_MCS_FLAGS += -d:FEATURE_CORE_DLR,FEATURE_REFEMIT,ANDROID
 endif
 
-ifeq (net_4_0, $(PROFILE))
-LIBRARY_COMPILE = $(BOOT_COMPILE)
+ifeq (monotouch, $(PROFILE))
+LIB_MCS_FLAGS += -d:FULL_AOT_RUNTIME
 endif
 
-CLR_PROFILE := $(filter 2.0 4.0, $(FRAMEWORK_VERSION))
-ifdef CLR_PROFILE
-LIB_MCS_FLAGS += -r:Mono.Posix -unsafe
+ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
+LIB_MCS_FLAGS += -d:FEATURE_CORE_DLR,FEATURE_REFEMIT,FEATURE_PDBEMIT
 endif
 
-TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
+ifneq (basic, $(PROFILE))
+CLR_PROFILE := $(filter 2.0 4.0 4.5, $(FRAMEWORK_VERSION))
+endif
 
-# 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
+ifdef CLR_PROFILE
+LIB_MCS_FLAGS += -r:Mono.Posix.dll
 endif
 
+TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
+
 include ../../build/library.make