From b55b6911a608a9c83e166d1a51bf2849741b9dd5 Mon Sep 17 00:00:00 2001
From: Aleksey Kliger <alklig@microsoft.com>
Date: Mon, 11 Jan 2021 22:02:40 -0500
Subject: [PATCH] Enable MBR by default if interpreter is enabled

For performance testing
---
 src/mono/CMakeLists.txt                                       | 4 ++++
 src/mono/mono.proj                                            | 1 +
 .../System.Private.CoreLib/System.Private.CoreLib.csproj      | 1 +
 src/mono/wasm/wasm.proj                                       | 1 +
 4 files changed, 7 insertions(+)

diff --git a/src/mono/CMakeLists.txt b/src/mono/CMakeLists.txt
index 2498840b8b69e7..810ff138a5cb4f 100644
--- a/src/mono/CMakeLists.txt
+++ b/src/mono/CMakeLists.txt
@@ -111,6 +111,10 @@ if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR(CMAKE_CXX_COMPILER_ID STREQUAL "Cla
   set(GCC 1)
 endif()
 
+if(DISABLE_INTERPRETER)
+  unset(ENABLE_METADATA_UPDATE)
+endif()
+
 add_definitions(-DHAVE_CONFIG_H)
 add_definitions(-DMONO_DLL_EXPORT)
 
diff --git a/src/mono/mono.proj b/src/mono/mono.proj
index c460c4515dafc2..1a0b62db0dce7b 100644
--- a/src/mono/mono.proj
+++ b/src/mono/mono.proj
@@ -12,6 +12,7 @@
   -->
 
   <PropertyGroup>
+    <MonoMetadataUpdate Condition="'$(MonoMetadataUpdate)' == ''">true</MonoMetadataUpdate>
     <MonoCrossDir Condition="'$(MonoCrossDir)' == '' and '$(ROOTFS_DIR)' != ''">$(ROOTFS_DIR)</MonoCrossDir>
     <MonoForceInterpreter Condition="'$(MonoForceInterpreter)' == ''">false</MonoForceInterpreter>
     <ScriptExt Condition="'$(OS)' == 'Windows_NT'">.cmd</ScriptExt>
diff --git a/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
index a48b961b142d28..523343a9f7862d 100644
--- a/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -3,6 +3,7 @@
   <Import Project="GenerateMonoCoreLibVersionFile.targets" />
 
   <PropertyGroup>
+    <MonoMetadataUpdate Condition="'$(MonoMetadataUpdate)' == ''">true</MonoMetadataUpdate>
     <EnableDefaultItems>false</EnableDefaultItems>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
     <GenerateResxSourceOmitGetResourceString>true</GenerateResxSourceOmitGetResourceString>
diff --git a/src/mono/wasm/wasm.proj b/src/mono/wasm/wasm.proj
index 092c10cbf17ec0..d201feb431b7ce 100644
--- a/src/mono/wasm/wasm.proj
+++ b/src/mono/wasm/wasm.proj
@@ -5,6 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
+    <MonoMetadataUpdate Condition="'$(MonoMetadataUpdate)' == ''">true</MonoMetadataUpdate>
     <!-- FIXME: clean up the duplication with libraries Directory.Build.props -->
     <PackageRID>browser-wasm</PackageRID>
     <NativeBinDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'native', '$(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)'))</NativeBinDir>