Skip to content

Commit 629f5f7

Browse files
committed
Move vc-redist install closer to winget install
Otherwise I always forget why vc-redist is needed.
1 parent 7a62c0d commit 629f5f7

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src-opam/opam.ml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,8 @@ let install_winget ?win10_revision ?winget version =
415415
| None when Windows.Winget.is_supported version ->
416416
( Windows.header ~alias:"winget-builder" ?win10_revision ~version ()
417417
@@ Windows.Winget.install_from_release (),
418-
Windows.Winget.setup ~from:"winget-builder" ()
418+
Windows.install_vc_redist ()
419+
@@ Windows.Winget.setup ~from:"winget-builder" ()
419420
@@ Windows.Winget.dev_packages ~version () )
420421
| _ -> (empty, empty)
421422

@@ -451,7 +452,6 @@ let windows_mingw_opam2 ?win10_revision ?winget ?(labels = []) ?arch
451452
@@ header ?win10_revision ?arch distro
452453
@@ label (("distro_style", "windows") :: labels)
453454
@@ user "ContainerAdministrator"
454-
@@ Windows.install_vc_redist ()
455455
@@ Windows.sanitize_reg_path ()
456456
@@ winget_setup @@ ocaml_for_windows
457457
@@ copy_opams_windows opam_branches
@@ -497,7 +497,6 @@ let windows_msvc_opam2 ?win10_revision ?winget ?(labels = []) ~opam_hashes
497497
@@ header ?win10_revision ?arch distro
498498
@@ label (("distro_style", "windows") :: labels)
499499
@@ user "ContainerAdministrator"
500-
@@ Windows.install_vc_redist ()
501500
@@ Windows.sanitize_reg_path ()
502501
@@ winget_setup @@ ocaml_for_windows
503502
@@ copy_opams_windows opam_branches

0 commit comments

Comments
 (0)