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.

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

Revert #7415 and #7450 #7887

Merged
merged 4 commits into from
Jun 5, 2023
Merged

Revert #7415 and #7450 #7887

merged 4 commits into from
Jun 5, 2023

Conversation

emillon
Copy link
Collaborator

@emillon emillon commented Jun 5, 2023

Fixes #7875

@emillon emillon force-pushed the revert-7415-7450 branch from f3ed8d7 to b1a2aa0 Compare June 5, 2023 13:48
@emillon emillon mentioned this pull request Jun 2, 2023
4 tasks
@emillon emillon force-pushed the revert-7415-7450 branch from b1a2aa0 to db020f0 Compare June 5, 2023 13:56
emillon added 4 commits June 5, 2023 15:57
…til context is known"

This reverts commit ab74a71.

Signed-off-by: Etienne Millon <[email protected]>
…px_runtime_libraries"

This reverts commit 096fc97.

Signed-off-by: Etienne Millon <[email protected]>
Signed-off-by: Etienne Millon <[email protected]>
@emillon
Copy link
Collaborator Author

emillon commented Jun 5, 2023

Discussed with @rgrinberg, @anmonteiro and confirmed to work by @samoht, so I'm merging this.

@emillon emillon merged commit 886df09 into ocaml:main Jun 5, 2023
emillon added a commit to emillon/dune that referenced this pull request Jun 5, 2023
* Revert "fix(x-compilation): delay evaluation of `ppx_runtime_deps` until context is known"

This reverts commit ab74a71.

Signed-off-by: Etienne Millon <[email protected]>

* Revert "test(x-compilation): demonstrate overlap check failure with ppx_runtime_libraries"

This reverts commit 096fc97.

Signed-off-by: Etienne Millon <[email protected]>

* Revert "fix(x-compilation): find host ppx dependencies in the host context (ocaml#7415)"

This reverts commit 16a7e88.

Signed-off-by: Etienne Millon <[email protected]>

* Changelog

Signed-off-by: Etienne Millon <[email protected]>

---------

Signed-off-by: Etienne Millon <[email protected]>
@emillon emillon deleted the revert-7415-7450 branch June 5, 2023 16:15
emillon added a commit that referenced this pull request Jun 5, 2023
* Revert "fix(x-compilation): delay evaluation of `ppx_runtime_deps` until context is known"

This reverts commit ab74a71.



* Revert "test(x-compilation): demonstrate overlap check failure with ppx_runtime_libraries"

This reverts commit 096fc97.



* Revert "fix(x-compilation): find host ppx dependencies in the host context (#7415)"

This reverts commit 16a7e88.



* Changelog



---------

Signed-off-by: Etienne Millon <[email protected]>
emillon added a commit to emillon/opam-repository that referenced this pull request Jun 5, 2023
CHANGES:

- Fix a crash when using a version of Coq < 8.13 due to the native compiler
  config variable being missing. We now explicitly default to `(mode vo)` for
  these older versions of Coq. (ocaml/dune#7847, fixes ocaml/dune#7846, @Alizter)

- Duplicate installed Coq theories are now allowed with the first appearing in
  COQPATH being preferred. This is inline with Coq's loadpath semantics. This
  fixes an issue with install layouts based on COQPATH such as those found in
  nixpkgs. (ocaml/dune#7790, @Alizter)

- Revert ocaml/dune#7415 and ocaml/dune#7450 (Resolve `ppx_runtime_libraries` in the target context when
  cross compiling) (ocaml/dune#7887, fixes ocaml/dune#7875, @emillon)
anmonteiro added a commit to anmonteiro/dune that referenced this pull request Jun 5, 2023
anmonteiro added a commit to anmonteiro/dune that referenced this pull request Jun 5, 2023
This reverts commit 886df09.

Signed-off-by: Antonio Nuno Monteiro <[email protected]>
anmonteiro added a commit to anmonteiro/dune that referenced this pull request Jun 9, 2023
This reverts commit 886df09.

Signed-off-by: Antonio Nuno Monteiro <[email protected]>
emillon added a commit to emillon/dune that referenced this pull request Jun 27, 2023
emillon added a commit to emillon/dune that referenced this pull request Jun 28, 2023
emillon added a commit to emillon/dune that referenced this pull request Jun 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3.8.0 regression: Error: Library "ppx_deriving_runtime" not found.
1 participant