Merge pull request #4380 from alexanderkyte/conflicting_attrs

[mono.git] / mcs / build / profiles / monotouch_runtime.make

diff --git a/mcs/build/profiles/monotouch_runtime.make b/mcs/build/profiles/monotouch_runtime.make
index f127fd7d19043fc3f7a79656697477b03a109cfa..67408bbf9ce4416bc9d380518a3925f0002b46d3 100644 (file)
--- a/mcs/build/profiles/monotouch_runtime.make
+++ b/mcs/build/profiles/monotouch_runtime.make
@@ -2,8 +2,8 @@
 
 BOOTSTRAP_PROFILE = build
 
-BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
-MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
+BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
+MCS = $(BOOTSTRAP_MCS)
 
 # Use system resgen as we don't want local System.Windows.Forms dependency
 RESGEN := $(dir $(shell which $(EXTERNAL_MCS)))resgen2
@@ -23,7 +23,6 @@ PROFILE_MCS_FLAGS = \
        -d:NET_4_5 \
        -d:MOBILE,MOBILE_LEGACY \
        -d:MONO \
-       -d:DISABLE_CAS_USE \
        -d:MONOTOUCH \
        -d:DISABLE_REMOTING \
        -d:DISABLE_COM \
@@ -31,11 +30,15 @@ PROFILE_MCS_FLAGS = \
        -nowarn:1699 \
        -nostdlib \
        $(DEFAULT_REFERENCES) \
-       $(PLATFORM_DEBUG_FLAGS)
+       $(PLATFORM_DEBUG_FLAGS) \
+       $(MONOTOUCH_MCS_FLAGS)
 
 FRAMEWORK_VERSION = 2.1
 
 # This is utility build only
 NO_INSTALL = yes
-MOBILE_STATIC = yes
+AOT_FRIENDLY_PROFILE = yes
 MOBILE_PROFILE = yes
+NO_CONSOLE = yes
+
+PROFILE_DISABLE_BTLS=1