Skip to content

Commit df422c7

Browse files
authored
Update build-windows-toolchain.bat
Update the toolchain build rules to allow us to package the VCRuntime dependency into the installer. This avoids the VS dependency in the case that we are cross-compiling to a non-Windows platform.
1 parent fd38fe4 commit df422c7

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

utils/build-windows-toolchain.bat

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -973,6 +973,8 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\bundle\installer.
973973
-p:BaseReleaseDownloadUrl=https://download.swift.org/development/windows ^
974974
-p:Configuration=Release ^
975975
-p:BaseOutputPath=%PackageRoot%\online\ ^
976+
-p:VCRedistInsaler="%VCToolsRedistDir%\vc_redist.%VSCMD_ARG_TGT_ARCH%.exe" ^
977+
-p:VSVersion=%VSCMD_VER% ^
976978
-p:DEVTOOLS_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain ^
977979
-p:TOOLCHAIN_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain ^
978980
-p:PLATFORM_ROOT=%PlatformRoot%\ ^
@@ -987,6 +989,8 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\bundle\installer.
987989
-p:BundleFlavor=offline ^
988990
-p:Configuration=Release ^
989991
-p:BaseOutputPath=%PackageRoot%\offline\ ^
992+
-p:VCRedistInsaler="%VCToolsRedistDir%\vc_redist.%VSCMD_ARG_TGT_ARCH%.exe" ^
993+
-p:VSVersion=%VSCMD_VER% ^
990994
-p:DEVTOOLS_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain ^
991995
-p:TOOLCHAIN_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain ^
992996
-p:PLATFORM_ROOT=%PlatformRoot%\ ^

0 commit comments

Comments
 (0)