Skip to content

[2.3 backport] Fix the compilation of opam on Windows with OCaml >= 5.0 (again)#6224

Merged
kit-ty-kate merged 5 commits intoocaml:2.3from
kit-ty-kate:2.3-fix-win32-ocaml5
Oct 9, 2024
Merged

[2.3 backport] Fix the compilation of opam on Windows with OCaml >= 5.0 (again)#6224
kit-ty-kate merged 5 commits intoocaml:2.3from
kit-ty-kate:2.3-fix-win32-ocaml5

Conversation

@kit-ty-kate
Copy link
Copy Markdown
Member

@kit-ty-kate kit-ty-kate commented Oct 2, 2024

Backport of #6216 to 2.3
Queued on #6225

@kit-ty-kate kit-ty-kate added this to the 2.3.0~alpha2 milestone Oct 2, 2024
@kit-ty-kate kit-ty-kate added the PR: QUEUED Pending pull request, waiting for other work to be merged or closed label Oct 8, 2024
@rjbou rjbou force-pushed the 2.3-fix-win32-ocaml5 branch from f1aa773 to 5940e7d Compare October 9, 2024 07:43
Windows is an exception since MSVC isn't supported yet (will
be in 5.3.0), and Cygwin fails when used in combination with C++
stubs. So only MinGW x86_64 is tested because it's the only one that
both works and is reasonably fast to run (i686 is too slow since it's
using bytecode).
…upported by master

This marginally increases build time (by 30s best case scenario) but is a necessary fix
@rjbou rjbou force-pushed the 2.3-fix-win32-ocaml5 branch from 5940e7d to f054de8 Compare October 9, 2024 07:51
@rjbou
Copy link
Copy Markdown
Collaborator

rjbou commented Oct 9, 2024

I've rebased and synchronised it with #6216

@rjbou rjbou added STATE: READY TO MERGE and removed PR: QUEUED Pending pull request, waiting for other work to be merged or closed labels Oct 9, 2024
@kit-ty-kate kit-ty-kate merged commit 7454cb1 into ocaml:2.3 Oct 9, 2024
@kit-ty-kate kit-ty-kate deleted the 2.3-fix-win32-ocaml5 branch October 9, 2024 10:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants