Revert "Try re-enabling IBC on macOS. (#39801)" (#43839)

This reverts commit 3a4298c.
dotnet · Oct 26, 2020 · 801ebec · 801ebec
1 parent dd23c81
commit 801ebec
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/eng/codeOptimization.targets b/eng/codeOptimization.targets
@@ -4,7 +4,12 @@
      <IsEligibleForNgenOptimization>true</IsEligibleForNgenOptimization>
      <IsEligibleForNgenOptimization Condition="'$(IsReferenceAssembly)' == 'true'">false</IsEligibleForNgenOptimization>
      <IsEligibleForNgenOptimization Condition="'$(GeneratePlatformNotSupportedAssembly)' == 'true' or '$(GeneratePlatformNotSupportedAssemblyMessage)' != ''">false</IsEligibleForNgenOptimization>
-     <IsEligibleForNgenOptimization Condition="'$(TargetsMobile)' == 'true'">false</IsEligibleForNgenOptimization>
+      <!-- There's an issue causing IBCMerge failures because of mismatched MVIDs
+           across many of our assemblies on Mac, so disable
+           IBCMerge optimizations on Mac for now to unblock the offical build.
+           See issue https://github.com/dotnet/runtime/issues/33303
+      -->
+      <IsEligibleForNgenOptimization Condition="'$(TargetOS)' == 'OSX' or '$(TargetsMobile)' == 'true'">false</IsEligibleForNgenOptimization>
   </PropertyGroup>
 
   <Target Name="SetApplyNgenOptimization"