From: Omair Majid <omajid@redhat.com>
Date: Wed, 1 Aug 2018 16:02:53 +0000 (-0400)
Subject: Use the identified python when building System.Private.CoreLib (dotnet/coreclr#19043)
X-Git-Tag: submit/tizen/20210909.063632~11030^2~4246
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=47fc505c9f5ae1926a88542d2179c0ba7b060295;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Use the identified python when building System.Private.CoreLib (dotnet/coreclr#19043)

build.sh and build.cmd contain logic to identify a working version of
python to use. System.Private.CoreLib ignores that and directly invokes
'python', which may not work, or even execute a different program.

Commit migrated from https://github.com/dotnet/coreclr/commit/5164e76ce01fc36833a7f5e6fb7b1ec2f55c2262
---

diff --git a/src/coreclr/build.sh b/src/coreclr/build.sh
index 091d622..4002f27 100755
--- a/src/coreclr/build.sh
+++ b/src/coreclr/build.sh
@@ -22,6 +22,8 @@ then
    exit 1
 fi
 
+export PYTHON
+
 usage()
 {
     echo "Usage: $0 [BuildArch] [BuildType] [-verbose] [-coverage] [-cross] [-clangx.y] [-ninja] [-configureonly] [-skipconfigure] [-skipnative] [-skipmscorlib] [-skiptests] [-stripsymbols] [-ignorewarnings] [-cmakeargs] [-bindir]"
diff --git a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
index 9a2fc68..0a02d3c 100644
--- a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -543,7 +543,7 @@
     <PropertyGroup>
       <CMakeDefinitionSaveFile>$(IntermediateOutputPath)..\cmake.definitions</CMakeDefinitionSaveFile>
     </PropertyGroup>
-    <Exec Command="python $(MSBuildThisFileDirectory)..\scripts\check-definitions.py &quot;$(CMakeDefinitionSaveFile)&quot; &quot;$(DefineConstants)&quot; &quot;$(IgnoreDefineConstants)&quot; " />
+    <Exec Command="&quot;$(PYTHON)&quot; $(MSBuildThisFileDirectory)..\scripts\check-definitions.py &quot;$(CMakeDefinitionSaveFile)&quot; &quot;$(DefineConstants)&quot; &quot;$(IgnoreDefineConstants)&quot; " />
   </Target>
   <PropertyGroup Condition="'$(BuildOS)' == 'Windows_NT'">
     <EnableDotnetAnalyzers Condition="'$(EnableDotnetAnalyzers)'==''">true</EnableDotnetAnalyzers>