From eda06bec400a1b0562d6fe54af3fa68f22f5a95b Mon Sep 17 00:00:00 2001
From: Imran Hameed <imhameed@microsoft.com>
Date: Tue, 16 Feb 2021 19:29:57 -0800
Subject: [PATCH 1/2] Add pass-through variables for CMAKE_EXE_LINKER_FLAGS,
 CMAKE_SHARED_LINKER_FLAGS, CMAKE_LINKER, CMAKE_AR, and CMAKE_RANLIB

---
 src/mono/mono.proj | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/mono/mono.proj b/src/mono/mono.proj
index 9d771022bc5cc7..669236bc25f448 100644
--- a/src/mono/mono.proj
+++ b/src/mono/mono.proj
@@ -52,6 +52,23 @@
     <MonoCxxCompiler Condition="'$(MonoCCompiler)' == 'gcc'">g++</MonoCxxCompiler>
   </PropertyGroup>
 
+  <ItemGroup Condition="'$(MonoCMakeUseLd)' != ''">
+    <_MonoCMakeArgs Include="-DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=$(MonoCMakeUseLd)" />
+    <_MonoCMakeArgs Include="-DCMAKE_SHARED_LINKER_FLAGS=-fuse-ld=$(MonoCMakeUseLd)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(MonoCMakeLd)' != ''">
+    <_MonoCMakeArgs Include="-DCMAKE_LINKER=$(MonoCMakeLd)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(MonoCMakeAr)' != ''">
+    <_MonoCMakeArgs Include="-DCMAKE_AR=$(MonoCMakeAr)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(MonoCMakeRanlib)' != ''">
+    <_MonoCMakeArgs Include="-DCMAKE_RANLIB=$(MonoCMakeRanlib)" />
+  </ItemGroup>
+
   <!-- default thread suspend for specific platforms -->
   <PropertyGroup>
     <MonoThreadSuspend Condition="'$(TargetswatchOS)' == 'true' and '$(MonoThreadSuspend)' == ''">coop</MonoThreadSuspend>
@@ -65,7 +82,7 @@
     <PackageReference Include="Microsoft.NETCore.Runtime.ICU.Transport" PrivateAssets="all" Version="$(MicrosoftNETCoreRuntimeICUTransportVersion)" GeneratePathProperty="true" />
   </ItemGroup>
 
-  <!-- CI specific build options -->    
+  <!-- CI specific build options -->
   <ItemGroup Condition="'$(ContinuousIntegrationBuild)' == 'true' and ('$(TargetsOSX)' == 'true' or '$(TargetsMacCatalyst)' == 'true')">
     <_MonoCMakeArgs Include="-DENABLE_WERROR=1"/>
   </ItemGroup>
@@ -499,7 +516,7 @@
 
       <!-- thread suspend -->
       <MonoAOTCMakeArgs Include="-DGC_SUSPEND=$(MonoThreadSuspend)" />
-    </ItemGroup> 
+    </ItemGroup>
 
     <PropertyGroup>
       <_MonoAotCrossOffsetsCommand Condition="'$(MonoUseCrossTool)' == 'true'">python3 $(MonoProjectRoot)mono/tools/offsets-tool/offsets-tool.py @(MonoAotCrossOffsetsToolParams, ' ')</_MonoAotCrossOffsetsCommand>

From 5eac7efde765129c797b60547d5ca2977a23dba7 Mon Sep 17 00:00:00 2001
From: Imran Hameed <imhameed@microsoft.com>
Date: Wed, 17 Feb 2021 01:13:27 -0800
Subject: [PATCH 2/2] Replace MonoCMake.* with MonoCMakeExtraArgs

---
 src/mono/mono.proj | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/mono/mono.proj b/src/mono/mono.proj
index 669236bc25f448..2eeb7c38c64128 100644
--- a/src/mono/mono.proj
+++ b/src/mono/mono.proj
@@ -52,23 +52,6 @@
     <MonoCxxCompiler Condition="'$(MonoCCompiler)' == 'gcc'">g++</MonoCxxCompiler>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(MonoCMakeUseLd)' != ''">
-    <_MonoCMakeArgs Include="-DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=$(MonoCMakeUseLd)" />
-    <_MonoCMakeArgs Include="-DCMAKE_SHARED_LINKER_FLAGS=-fuse-ld=$(MonoCMakeUseLd)" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(MonoCMakeLd)' != ''">
-    <_MonoCMakeArgs Include="-DCMAKE_LINKER=$(MonoCMakeLd)" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(MonoCMakeAr)' != ''">
-    <_MonoCMakeArgs Include="-DCMAKE_AR=$(MonoCMakeAr)" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(MonoCMakeRanlib)' != ''">
-    <_MonoCMakeArgs Include="-DCMAKE_RANLIB=$(MonoCMakeRanlib)" />
-  </ItemGroup>
-
   <!-- default thread suspend for specific platforms -->
   <PropertyGroup>
     <MonoThreadSuspend Condition="'$(TargetswatchOS)' == 'true' and '$(MonoThreadSuspend)' == ''">coop</MonoThreadSuspend>
@@ -373,7 +356,7 @@
     </ItemGroup>
 
     <PropertyGroup>
-      <_MonoCMakeConfigureCommand>cmake @(_MonoCMakeArgs, ' ') $(MonoProjectRoot)</_MonoCMakeConfigureCommand>
+      <_MonoCMakeConfigureCommand>cmake @(_MonoCMakeArgs, ' ') $(MonoCMakeExtraArgs) $(MonoProjectRoot)</_MonoCMakeConfigureCommand>
       <_MonoCMakeConfigureCommand Condition="'$(TargetsBrowser)' != 'true' and '$(_MonoRunInitCompiler)' != 'false' and '$(OS)' != 'Windows_NT'">bash -c 'source $(RepositoryEngineeringDir)native/init-compiler.sh $(Platform) $(MonoCCompiler) &amp;&amp; @(_MonoBuildEnv, ' ') $(_MonoCMakeConfigureCommand)'</_MonoCMakeConfigureCommand>
       <_MonoCMakeConfigureCommand Condition="'$(TargetsBrowser)' != 'true' and '$(_MonoRunInitCompiler)' != 'false' and '$(OS)' == 'Windows_NT'">set __repoRoot=&quot;$(RepoRoot)&quot; &amp;&amp; call &quot;$(RepositoryEngineeringDir)native\init-compiler-and-cmake.cmd&quot; $(Platform) &amp;&amp; cd /D &quot;$(MonoObjDir)&quot; &amp;&amp; @(_MonoBuildEnv, ' ') $(_MonoCMakeConfigureCommand)</_MonoCMakeConfigureCommand>
       <_MonoCMakeConfigureCommand Condition="'$(TargetsBrowser)' != 'true' and '$(_MonoRunInitCompiler)' == 'false'">$(_MonoCCOption) $(_MonoCXXOption) @(_MonoBuildEnv, ' ') $(_MonoCMakeConfigureCommand)</_MonoCMakeConfigureCommand>