Merge pull request #3823 from mono/fix-btls-managed
authorAlexander Köplinger <alex.koeplinger@outlook.com>
Tue, 25 Oct 2016 20:29:23 +0000 (22:29 +0200)
committerGitHub <noreply@github.com>
Tue, 25 Oct 2016 20:29:23 +0000 (22:29 +0200)
[System] Don't build managed BTLS code on monotouch

1  2 
mcs/class/System/Makefile
mcs/class/System/Mono.Btls/MonoBtlsContext.cs
mcs/class/System/Mono.Btls/MonoBtlsX509StoreManager.cs
mcs/class/System/Mono.Btls/X509ChainImplBtls.cs

index e78fabeda46889c5484667d34a13c874da8c6332,3b75713e6d5f31890af8e42b80fdea8d63ec9cf3..e9ab8a4118c4cd669440e0b4c97da16bd00a3137
@@@ -40,10 -40,18 +40,18 @@@ REFERENCE_SOURCES_FLAGS += -d:MONO_FEAT
  TEST_MCS_FLAGS += -d:MONO_FEATURE_PROCESS_START
  endif
  
 -LIB_MCS_FLAGS = -nowarn:618 -d:CONFIGURATION_2_0 $(REFERENCE_SOURCES_FLAGS) -unsafe $(RESOURCE_FILES:%=-resource:%)
 +LIB_MCS_FLAGS = -d:CONFIGURATION_2_0 $(REFERENCE_SOURCES_FLAGS) -unsafe $(RESOURCE_FILES:%=-resource:%)
  
- ifdef DYNAMIC_BTLS
- LIB_MCS_FLAGS += -d:DYNAMIC_BTLS
+ ifndef PROFILE_DISABLE_BTLS
+ ifdef HAVE_BTLS
+ LIB_MCS_FLAGS += -d:MONO_FEATURE_BTLS
+ ifdef HAVE_DYNAMIC_BTLS
+ LIB_MCS_FLAGS += -d:MONO_FEATURE_DYNAMIC_BTLS
+ endif
+ endif
  endif
  
  ifndef NO_THREAD_ABORT