Skip to content

Commit

Permalink
Revert "[tools] Disable Objective-C exception handling for macOS .NET…
Browse files Browse the repository at this point in the history
… apps due to a missing feature in the runtime. (xamarin#10123)"

This reverts commit 75979ca.
  • Loading branch information
rolfbjarne committed Mar 22, 2021
1 parent 00c133b commit e56e7bb
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions tools/common/Target.cs
Original file line number Diff line number Diff line change
Expand Up @@ -613,12 +613,7 @@ void GenerateMacMain (StringWriter sw)
sw.WriteLine ("\txamarin_executable_name = \"{0}\";", App.AssemblyName);
if (!App.IsDefaultMarshalManagedExceptionMode)
sw.WriteLine ("\txamarin_marshal_managed_exception_mode = MarshalManagedExceptionMode{0};", App.MarshalManagedExceptions);
#if NET
// We require support for dllmap, which isn't in .NET/macOS yet (https://github.com/dotnet/runtime/issues/43204), so disable
sw.WriteLine ("\txamarin_marshal_objectivec_exception_mode = MarshalObjectiveCExceptionModeDisable;");
#else
sw.WriteLine ("\txamarin_marshal_objectivec_exception_mode = MarshalObjectiveCExceptionMode{0};", App.MarshalObjectiveCExceptions);
#endif
if (App.DisableLldbAttach.HasValue ? App.DisableLldbAttach.Value : !App.EnableDebug)
sw.WriteLine ("\txamarin_disable_lldb_attach = true;");
if (App.DisableOmitFramePointer ?? App.EnableDebug)
Expand Down

0 comments on commit e56e7bb

Please sign in to comment.