From 192a94e6c5e3c5862bca8c3febc0f751252d0bd3 Mon Sep 17 00:00:00 2001
From: rc-swag <58423624+rc-swag@users.noreply.github.com>
Date: Tue, 2 Dec 2025 16:07:04 +1000
Subject: [PATCH] feat(windows): simplify vc config environment

With VS2022 the limitations for the -hostarch flag not being available
on arm environment and the -arch only having x86 and x64 has been
removed. There is now single command that works for 3 builds on either
host architecture.
Fixes: 15239
Test-bot: skip
---
 core/build.bat | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/core/build.bat b/core/build.bat
index 807ca9ba7d..c726d8592b 100644
--- a/core/build.bat
+++ b/core/build.bat
@@ -86,23 +86,7 @@ if not exist "!VsDevCmd_Path!" (
 
 echo === Configuring VC++ ===
 set VSCMD_SKIP_SENDTELEMETRY=1
-rem vsdevcmd.bat -arch parameter for 2019 is can only be x86 or amd64. (arm64 is not supported till 2022)
-rem -host_arch does support is required for arm64 builds on x86/amd64 hosts.
-rem However on arm64 host we cant even use vsdevcmd -arch=arm64 as it fails.(2019)
-rem for now we will have workaround this untill updating to VS2022
-if /I "%HOST_ARCH%"=="arm64" (
-  if /I "%ARCH%"=="arm64" (
-    call "!VsDevCmd_Path!" -no_logo -startdir=none || exit !errorlevel!
-  ) else (
-    call "!VsDevCmd_Path!" -arch=!ARCH! -no_logo -startdir=none || exit !errorlevel!
-  )
-) else (
-  if /I "%ARCH%"=="arm64" (
-    call "!VsDevCmd_Path!" -arch=!ARCH! -host_arch=!HOST_ARCH! -no_logo -startdir=none || exit !errorlevel!
-  ) else (
-    call "!VsDevCmd_Path!" -arch=!ARCH! -no_logo -startdir=none || exit !errorlevel!
-  )
-)
+call "!VsDevCmd_Path!" -arch=!ARCH! -host_arch=!HOST_ARCH! -no_logo -startdir=none || exit !errorlevel!
 cd %KEYMAN_ROOT%\core
 
 set BUILDTYPE=%1