[mono/mono] c2dfadef: Fix the mobile_static build.

"Rodrigo Kumpera ([email protected])" <[email protected]> Mon, 4 Nov 2013 22:04:22 +0000
Newsgroups gmane.comp.gnome.mono.patches
Message-ID <0000014225252a71-1f710e99-2944-4a47-af0a-0a34d08ef2a5-000000@email.amazonses.com>
   Branch: refs/heads/master
     Home: https://github.com/mono/mono
  Compare: https://github.com/mono/mono/compare/0261d6fceac6...c2dfadefc2d5

   Commit: c2dfadefc2d569c73d952dac3fcbfde26056497e
   Author: Rodrigo Kumpera <[email protected]> (kumpera)
     Date: 2013-11-04 22:02:43 GMT
      URL: https://github.com/mono/mono/commit/c2dfadefc2d569c73d952dac3fcbfde26056497e

Fix the mobile_static build.

Changed paths:
  M mcs/class/Facades/Makefile
  M mcs/class/Facades/System.Linq.Expressions/TypeForwarders.cs
  M mcs/class/Facades/System.Reflection.Primitives/TypeForwarders.cs
  M mcs/class/Facades/System.Runtime.InteropServices/TypeForwarders.cs

Modified: mcs/class/Facades/Makefile
===================================================================
@@ -4,6 +4,8 @@ thisdir = class/Facades
 
 monotouch_SUBDIRS = System.Collections.Concurrent System.Collections System.ComponentModel.Annotations System.ComponentModel.EventBasedAsync System.ComponentModel System.Diagnostics.Contracts System.Diagnostics.Debug System.Diagnostics.Tools System.Globalization System.IO System.Linq.Expressions System.Linq.Parallel System.Linq.Queryable System.Linq System.Net.NetworkInformation System.Net.Primitives System.Net.Requests System.ObjectModel System.Reflection.Extensions System.Reflection.Primitives System.Reflection System.Resources.ResourceManager System.Runtime.Extensions System.Runtime.InteropServices System.Runtime.Numerics System.Runtime.Serialization.Json System.Runtime.Serialization.Primitives System.Runtime.Serialization.Xml System.Runtime System.Security.Principal System.ServiceMode
 l.Http System.ServiceModel.Primitives System.Text.Encoding.Extensions System.Text.Encoding System.Text.RegularExpressions System.Threading.Tasks.Parallel System.Threading.Tasks System.Threading Syst
 em.Xml.ReaderWriter System.Xml.XDocument System.Xml.XmlSerializer
 
+mobile_static_SUBDIRS = $(monotouch_SUBDIRS)
+
 net_4_5_SUBDIRS = $(monotouch_SUBDIRS) System.Dynamic.Runtime System.Reflection.Emit.ILGeneration System.Reflection.Emit.Lightweight System.Reflection.Emit
 
 monodroid_SUBDIRS = $(net_4_5_SUBDIRS)

Modified: mcs/class/Facades/System.Linq.Expressions/TypeForwarders.cs
===================================================================
@@ -20,7 +20,7 @@
 // THE SOFTWARE.
 // 
 
-#if !MONOTOUCH
+#if !FULL_AOT_RUNTIME
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.BlockExpression))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.CatchBlock))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.DebugInfoExpression))]

Modified: mcs/class/Facades/System.Reflection.Primitives/TypeForwarders.cs
===================================================================
@@ -20,7 +20,7 @@
 // THE SOFTWARE.
 // 
 
-#if !MONOTOUCH
+#if !FULL_AOT_RUNTIME
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.Emit.FlowControl))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.Emit.OpCode))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.Emit.OpCodes))]

Modified: mcs/class/Facades/System.Runtime.InteropServices/TypeForwarders.cs
===================================================================
@@ -20,7 +20,7 @@
 // THE SOFTWARE.
 // 
 
-#if !MONOTOUCH
+#if !FULL_AOT_RUNTIME
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.ComImportAttribute))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.DispatchWrapper))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.ErrorWrapper))]


_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches