Skip to content

Commit 0af4108

Browse files
authored
Merge pull request #69182 from compnerd/redist
build: bundle the VC redist in the installer
2 parents 99c0834 + ec1159a commit 0af4108

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
@@ -974,6 +974,8 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\bundle\installer.
974974
-p:BaseReleaseDownloadUrl=https://download.swift.org/development/windows ^
975975
-p:Configuration=Release ^
976976
-p:BaseOutputPath=%PackageRoot%\online\ ^
977+
-p:VCRedistInstaller="%VCToolsRedistDir%\vc_redist.%VSCMD_ARG_TGT_ARCH%.exe" ^
978+
-p:VSVersion=%VSCMD_VER% ^
977979
-p:DEVTOOLS_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain ^
978980
-p:TOOLCHAIN_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain ^
979981
-p:PLATFORM_ROOT=%PlatformRoot%\ ^
@@ -988,6 +990,8 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\bundle\installer.
988990
-p:BundleFlavor=offline ^
989991
-p:Configuration=Release ^
990992
-p:BaseOutputPath=%PackageRoot%\offline\ ^
993+
-p:VCRedistInstaller="%VCToolsRedistDir%\vc_redist.%VSCMD_ARG_TGT_ARCH%.exe" ^
994+
-p:VSVersion=%VSCMD_VER% ^
991995
-p:DEVTOOLS_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain ^
992996
-p:TOOLCHAIN_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain ^
993997
-p:PLATFORM_ROOT=%PlatformRoot%\ ^

0 commit comments

Comments
 (0)