summaryrefslogtreecommitdiff
path: root/build-test.cmd
diff options
context:
space:
mode:
authorBruce Forstall <brucefo@microsoft.com>2017-10-30 09:26:49 -0700
committerGitHub <noreply@github.com>2017-10-30 09:26:49 -0700
commit9b6d5cdf7076f09f40273793d0f38c78c11ed764 (patch)
tree6c665e42a654393adc26710820d9fb6d46f0e8f7 /build-test.cmd
parent0c8b4af17f1206dee394205b6c9b428955e0a944 (diff)
parent52ebf91408fafea70396ca8bf2589c655f6d6bdd (diff)
downloadcoreclr-9b6d5cdf7076f09f40273793d0f38c78c11ed764.tar.gz
coreclr-9b6d5cdf7076f09f40273793d0f38c78c11ed764.tar.bz2
coreclr-9b6d5cdf7076f09f40273793d0f38c78c11ed764.zip
Merge pull request #14712 from BruceForstall/VS2017Arm64
Allow building arm64 using VS2017 tools
Diffstat (limited to 'build-test.cmd')
-rw-r--r--build-test.cmd16
1 files changed, 9 insertions, 7 deletions
diff --git a/build-test.cmd b/build-test.cmd
index 7da1807136..7101ef12b1 100644
--- a/build-test.cmd
+++ b/build-test.cmd
@@ -90,7 +90,7 @@ if /i "%1" == "-help" goto Usage
if /i "%1" == "x64" (set __BuildArch=x64&set __VCBuildArch=x86_amd64&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
if /i "%1" == "x86" (set __BuildArch=x86&set __VCBuildArch=x86&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
if /i "%1" == "arm" (set __BuildArch=arm&set __VCBuildArch=x86_arm&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-if /i "%1" == "arm64" (set __BuildArch=arm64&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
+if /i "%1" == "arm64" (set __BuildArch=arm64&set __VCBuildArch=x86_arm64&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
if /i "%1" == "debug" (set __BuildType=Debug&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
if /i "%1" == "release" (set __BuildType=Release&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
@@ -127,9 +127,11 @@ if defined __BuildAgainstPackagesArg (
set __RunArgs=-BuildOS=%__BuildOS% -BuildType=%__BuildType% -BuildArch=%__BuildArch%
-rem arm64 builds currently use private toolset which has not been released yet
-REM TODO, remove once the toolset is open.
-if /i "%__BuildArch%" == "arm64" call :PrivateToolSet
+if defined __ToolsetDir (
+ rem arm64 builds currently use private toolset which has not been released yet
+ REM TODO, remove once the toolset is open.
+ call :PrivateToolSet
+)
echo %__MsgPrefix%Commencing CoreCLR repo test build
@@ -186,8 +188,8 @@ REM ============================================================================
echo %__MsgPrefix%Commencing build of native test components for %__BuildArch%/%__BuildType%
if defined __ToolsetDir (
- echo %__MsgPrefix%ToolsetDir is defined to be :%__ToolsetDir%
- goto GenVSSolution :: Private ToolSet is Defined
+ echo %__MsgPrefix%ToolsetDir is defined to be %__ToolsetDir%
+ goto GenVSSolution :: Private ToolSet is Defined
)
:: Set the environment for the native build
@@ -491,7 +493,7 @@ exit /b 1
:PrivateToolSet
-echo %__MsgPrefix% Setting Up the usage of __ToolsetDir:%__ToolsetDir%
+echo %__MsgPrefix%Setting up the usage of __ToolsetDir:%__ToolsetDir%
if /i "%__ToolsetDir%" == "" (
echo %__MsgPrefix%Error: A toolset directory is required for the Arm64 Windows build. Use the toolset_dir argument.