From d16b9c3ae8c466f36d3b1401d22af6e4fab0352c Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Fri, 3 Oct 2025 22:40:55 -0700
Subject: [PATCH] utils: build all variants when packaging

The packaging (toolchain build) requires that all of the configurations
are built. Ensure that we enable all the variants when doing a packaging
build.
---
 utils/build-windows-toolchain.bat | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/utils/build-windows-toolchain.bat b/utils/build-windows-toolchain.bat
index c04992b45ae52..ea4633fb394c6 100644
--- a/utils/build-windows-toolchain.bat
+++ b/utils/build-windows-toolchain.bat
@@ -71,8 +71,9 @@ set "PackagingArg=-SkipPackaging"
 if not "%INCLUDE_PACKAGING%"=="" set "PackagingArg=-Stage %PackageRoot%"
 
 :: Build the arguments related to Windows SDK builds
-set "WindowsSDKArgs=-Windows -WindowsSDKLinkModes dynamic"
-if not "%WINDOWS_SDKS%"=="" set "WindowsSDKArgs=-Windows -WindowsSDKArchitectures %WINDOWS_SDKS% -WindowsSDKLinkModes dynamic"
+set "WindowsSDKArgs=-Windows"
+if "%INCLUDE_PACKAGING%"=="" set "WindowsSDKArgs=%WindowsSDKArgs% -WindowsSDKLinkModes dynamic"
+if not "%WINDOWS_SDKS%"=="" set "WindowsSDKArgs=%WindowsSDKArgs% -WindowsSDKArchitectures %WINDOWS_SDKS%"
 
 :: Build the -HostArchName argument, if any.
 set "HostArchNameArg="