Skip to content

Commit 6ef6813

Browse files
authored
Merge pull request #28449 from dra27/ocaml-compiler-msvc
Fix ocaml-base-compiler.5.3.0+ for MSVC
2 parents 61c17ba + 466c715 commit 6ef6813

File tree

2 files changed

+8
-2
lines changed
  • packages
    • ocaml-option-no-compression/ocaml-option-no-compression.1
    • ocaml-options-vanilla/ocaml-options-vanilla.1

2 files changed

+8
-2
lines changed

packages/ocaml-option-no-compression/ocaml-option-no-compression.1/opam

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@ homepage: "https://opam.ocaml.org"
88
bug-reports: "https://github.com/ocaml/opam-repository/issues"
99
license: "CC0-1.0+"
1010
depends: [
11-
"ocaml-variants" {post & >= "5.1.0~"}
11+
"ocaml-variants" {post & >= "5.1.0~"} |
12+
# The MSVC port OCaml doesn't support compression and for equivalence with the
13+
# handling of ocaml-option-bytecode-only pulls in ocaml-option-no-compression.
14+
# As with ocaml-option-bytecode-only, this is a temporary fix until
15+
# ocaml-option- / base- is sorted out properly.
16+
("ocaml-base-compiler" {post & >= "5.1.0~"} & "host-system-msvc" {post})
1217
]
1318
maintainer: "David Allsopp <[email protected]>"
1419
flags: compiler

packages/ocaml-options-vanilla/ocaml-options-vanilla.1/opam

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ conflicts: [
2727
"ocaml-option-fp"
2828
"ocaml-option-musl"
2929
"ocaml-option-no-flat-float-array"
30-
"ocaml-option-no-compression"
30+
# See constraint in ocaml-option-no-compression
31+
"ocaml-option-no-compression" {os != "win32"}
3132
"ocaml-option-spacetime"
3233
"ocaml-option-static"
3334
"ocaml-option-nnp"

0 commit comments

Comments
 (0)