[corlib] Add back X509 support for watchOS.

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

diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile
index 882a3cf0419bbb6d8ac57d67550e4e3a1b7e40a0..ba8f3e4015ec7ea8b546a4e9e4c9a07616ef8f15 100644 (file)
--- a/mcs/class/corlib/Makefile
+++ b/mcs/class/corlib/Makefile
@@ -11,17 +11,25 @@ LIB_MCS_FLAGS = $(REFERENCE_SOURCES_FLAGS) $(RESOURCE_FILES:%=-resource:%)
 #LIBRARY_USE_INTERMEDIATE_FILE = yes
 
 ifeq (2, $(FRAMEWORK_VERSION_MAJOR))
-LIB_MCS_FLAGS += --runtime:v4
+LIB_MCS_FLAGS += -runtimemetadataversion:v4.0.30319
 else
 ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
-LIB_MCS_FLAGS += --runtime:v4
+LIB_MCS_FLAGS += -runtimemetadataversion:v4.0.30319
 else
 $(error Unknown framework version)
 endif
 endif
 
+ifeq ($(PROFILE),build)
+CSC_RUNTIME_FLAGS=--profile=aot:output=$(topdir)/class/lib/$(PROFILE)/csc.$(LIBRARY).aotprofile
+endif
+
 RESOURCE_STRINGS = ../referencesource/mscorlib/mscorlib.txt
 
+RESX_RESOURCE_STRING = \
+       ../../../external/corert/src/System.Private.CoreLib/src/Resources/Strings.resx \
+       ../../../external/corefx/src/System.Collections.Concurrent/src/Resources/Strings.resx
+
 LIBRARY_COMPILE = $(BOOT_COMPILE)
 LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
 
@@ -41,7 +49,7 @@ ifndef MOBILE_PROFILE
 REFERENCE_SOURCES_FLAGS += -d:FEATURE_MACL
 endif
 
-ifndef MOBILE_STATIC
+ifndef AOT_FRIENDLY_PROFILE
 REFERENCE_SOURCES_FLAGS += -d:FEATURE_REMOTING,MONO_COM,FEATURE_COMINTEROP,FEATURE_ROLE_BASED_SECURITY
 endif
 
@@ -60,14 +68,30 @@ REFERENCE_SOURCES_FLAGS += -d:MONO_FEATURE_MULTIPLE_APPDOMAINS
 TEST_MCS_FLAGS += -d:MONO_FEATURE_MULTIPLE_APPDOMAINS
 endif
 
+ifndef NO_CONSOLE
+LIB_MCS_FLAGS += -d:MONO_FEATURE_CONSOLE
+endif
+
+ifdef MONO_FEATURE_APPLETLS
+LIB_MCS_FLAGS += -d:MONO_FEATURE_APPLETLS
+endif
+
+ifdef ONLY_APPLETLS
+LIB_MCS_FLAGS += -d:ONLY_APPLETLS
+endif
+
+ifdef MONO_FEATURE_APPLE_X509
+LIB_MCS_FLAGS += -d:MONO_FEATURE_APPLE_X509
+endif
+
 WARNING_ABOUT_DISABLED_WARNING=1635
 LOCAL_MCS_FLAGS = -unsafe -nostdlib -nowarn:612,618,$(WARNING_ABOUT_DISABLED_WARNING) -d:INSIDE_CORLIB,MONO_CULTURE_DATA -d:LIBC $(REFERENCE_SOURCES_FLAGS)
 DEFAULT_REFERENCES =
 
 TEST_LIB_REFS = System.Core System
 
-ifndef MOBILE_STATIC
-ifneq ($(PROFILE),aot_hybrid)
+ifndef AOT_FRIENDLY_PROFILE
+ifneq ($(PROFILE),testing_aot_hybrid)
 TEST_LIB_REFS += Mono.Posix
 endif
 endif