diff options
| author | Steve Pfister <steveisok@users.noreply.github.com> | 2021-07-23 19:40:37 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-23 19:40:37 +0300 |
| commit | 881f3c6c2b9800dfce3c0d2dd1a98771364754e2 (patch) | |
| tree | dfe0cb6f791c00aadf6ac3a3b6989ab62a27e262 /src/tasks | |
| parent | 0bd7ddcb68b37a4fd37dc9ed57101f6061128408 (diff) | |
[Mono] Cleans up test build when targeting iOS/tvOSSimulator on arm64. Enables arm64 sim on CI (#55577)
Diffstat (limited to 'src/tasks')
| -rw-r--r-- | src/tasks/AppleAppBuilder/AppleAppBuilder.cs | 5 | ||||
| -rw-r--r-- | src/tasks/AppleAppBuilder/Templates/runtime.m | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/tasks/AppleAppBuilder/AppleAppBuilder.cs b/src/tasks/AppleAppBuilder/AppleAppBuilder.cs index a0637d8d845..6183fe0442f 100644 --- a/src/tasks/AppleAppBuilder/AppleAppBuilder.cs +++ b/src/tasks/AppleAppBuilder/AppleAppBuilder.cs @@ -204,11 +204,6 @@ public class AppleAppBuilderTask : Task throw new InvalidOperationException("Need list of AOT files for device builds."); } - if (TargetOS != TargetNames.MacCatalyst && ForceInterpreter && ForceAOT) - { - throw new InvalidOperationException("Interpreter and AOT cannot be enabled at the same time"); - } - if (!string.IsNullOrEmpty(DiagnosticPorts)) { bool validDiagnosticsConfig = false; diff --git a/src/tasks/AppleAppBuilder/Templates/runtime.m b/src/tasks/AppleAppBuilder/Templates/runtime.m index fa906e8070e..de9ca63b868 100644 --- a/src/tasks/AppleAppBuilder/Templates/runtime.m +++ b/src/tasks/AppleAppBuilder/Templates/runtime.m @@ -302,7 +302,7 @@ mono_ios_runtime_init (void) // register modules register_aot_modules (); -#if (FORCE_INTERPRETER && TARGET_OS_MACCATALYST) +#if (FORCE_INTERPRETER && FORCE_AOT) os_log_info (OS_LOG_DEFAULT, "AOT INTERP Enabled"); mono_jit_set_aot_mode (MONO_AOT_MODE_INTERP); #else |