From: Russ Keldorph <Russ.Keldorph@microsoft.com>
Date: Sun, 23 Apr 2017 13:42:14 +0000 (-0700)
Subject: Support other toolsets in Win/ARM64 build
X-Git-Tag: submit/tizen/20210909.063632~11030^2~7145
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b22e61d1fdfc8a540b5343649d4bbed179ac553;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Support other toolsets in Win/ARM64 build


Commit migrated from https://github.com/dotnet/coreclr/commit/07fed33cbc499a6e5d84b14a23a54052c61040bf
---

diff --git a/src/coreclr/build-test.cmd b/src/coreclr/build-test.cmd
index dbb4e8a..514bb23 100644
--- a/src/coreclr/build-test.cmd
+++ b/src/coreclr/build-test.cmd
@@ -473,6 +473,11 @@ if /i "%__ToolsetDir%" == "" (
     exit /b 1
 )
 
+if not exist "%__ToolsetDir%"\buildenv_arm64.cmd goto :Not_EWDK
+call "%__ToolsetDir%"\buildenv_arm64.cmd
+exit /b 0
+
+:Not_EWDK
 set PATH=%__ToolsetDir%\VC_sdk\bin;%PATH%
 set LIB=%__ToolsetDir%\VC_sdk\lib\arm64;%__ToolsetDir%\sdpublic\sdk\lib\arm64
 set INCLUDE=^
@@ -514,4 +519,4 @@ if %__exitCode% neq 0 (
 )
     
 echo Successfully precompiled %2
-exit /b 0
\ No newline at end of file
+exit /b 0
diff --git a/src/coreclr/build.cmd b/src/coreclr/build.cmd
index 904bb02..64945cc 100644
--- a/src/coreclr/build.cmd
+++ b/src/coreclr/build.cmd
@@ -687,6 +687,11 @@ if /i "%__ToolsetDir%" == "" (
     exit /b 1
 )
 
+if not exist "%__ToolsetDir%"\buildenv_arm64.cmd goto :Not_EWDK
+call "%__ToolsetDir%"\buildenv_arm64.cmd
+exit /b 0
+
+:Not_EWDK
 set PATH=%__ToolsetDir%\VC_sdk\bin;%PATH%
 set LIB=%__ToolsetDir%\VC_sdk\lib\arm64;%__ToolsetDir%\sdpublic\sdk\lib\arm64
 set INCLUDE=^