Conditional patches #16
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kit-ty-kate
reviewed
Oct 31, 2022
| @@ -54,5 +54,5 @@ url { | |||
| ] | |||
| } | |||
| x-commit-hash: "6fb1d008061b6c028c375b240882bb735d54a5bc" | |||
| patches: ["js_of_ocaml.patch"] | |||
| patches: ["js_of_ocaml.patch"] { ?ocaml-variants:flambda-backend & ocaml-variants:flambda-backend } | |||
There was a problem hiding this comment.
wouldn't that make opam fail in --strict mode?
There was a problem hiding this comment.
I'm not sure what exactly --strict mode implies, but I was hoping that prefixing with the ?ocaml-variants:flambda-backend check would make it robust.
There was a problem hiding this comment.
I've created switches with both a flambda-backend compiler and a regular one, and installed ocaml-compiler-libs.v0.12.4+flambda2 on them, all of this with --strict, and I didn't get any errors.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a proper version of #15. It introduces a configuration variable for compilers based on flambda-backend, and uses it as condition for patches that are not compatible with the upstream compiler.
(Thanks to @rjbou for helping with this.)
It also renames the
ocaml-compiler-libsversion to add+flambda2, as the other packages in this repo.