Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix architecture support for OCaml 5.x #21510

Merged
merged 5 commits into from
Jun 11, 2022
+60 −5
Merged

Fix architecture support for OCaml 5.x #21510

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7322cf0
Patch opam-depext for bytecode-only builds
dra27 Jun 11, 2022
ee72021
Conflict native options in bytecode-only
dra27 Jun 11, 2022
2907050
ocaml-option-fp only available on linux x86_64
dra27 Jun 11, 2022
3487a6f
OCaml 5.x doesn't yet support frame pointers
dra27 Jun 11, 2022
98911a0
Update OCaml 5.x architecture support
dra27 Jun 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
OCaml 5.x doesn't yet support frame pointers
  • Loading branch information
@dra27
dra27 committed Jun 11, 2022
commit 3487a6f7f7ac386ffe67209186b563fe2d935019
2 changes: 1 addition & 1 deletion packages/ocaml-variants/ocaml-variants.5.0.0+trunk/opam
View file
Original file line number Diff line number Diff line change
@@ -63,14 +63,14 @@ post-messages: [
to force a sequential build instead."
{failure & jobs > 1 & os != "cygwin" & opam-version >= "2.0.5"}
]
conflicts: [ "ocaml-option-fp" ]
depopts: [
"ocaml-option-32bit"
"ocaml-option-afl"
"ocaml-option-bytecode-only"
"ocaml-option-default-unsafe-string"
"ocaml-option-no-flat-float-array"
"ocaml-option-flambda"
"ocaml-option-fp"
"ocaml-option-musl"
"ocaml-option-static"
]
2 changes: 1 addition & 1 deletion packages/ocaml-variants/ocaml-variants.5.1.0+trunk/opam
View file
Original file line number Diff line number Diff line change
@@ -63,14 +63,14 @@ post-messages: [
to force a sequential build instead."
{failure & jobs > 1 & os != "cygwin" & opam-version >= "2.0.5"}
]
conflicts: [ "ocaml-option-fp" ]
depopts: [
"ocaml-option-32bit"
"ocaml-option-afl"
"ocaml-option-bytecode-only"
"ocaml-option-default-unsafe-string"
"ocaml-option-no-flat-float-array"
"ocaml-option-flambda"
"ocaml-option-fp"
"ocaml-option-musl"
"ocaml-option-static"
]