Skip to content

[3.24.0] backport #14715#15091

Merged
shonfeder merged 6 commits into
ocaml:3.24.0-rcfrom
Alizter:push-tomtrlvmqnpy
Jun 11, 2026
Merged

[3.24.0] backport #14715#15091
shonfeder merged 6 commits into
ocaml:3.24.0-rcfrom
Alizter:push-tomtrlvmqnpy

Conversation

@Alizter

@Alizter Alizter commented Jun 9, 2026

Copy link
Copy Markdown
Collaborator

Backport #14715 onto 3.24.0-rc.

Fixes the melange build failure on OCaml 4.14 where dune emits an I/O error: jscomp/runtime/.melange_src/X.mli: No such file or directory against every melange-re/melange.*-414 reverse dep (see ocaml/opam-repository#29996 — the 3.24.0~alpha2 release PR). The fix is to skip the line directive in setup_melange_sources_copy_rules when a module uses non-staged PPX, since the PPX pipeline now passes -loc-filename separately and adding the directive would double-shift diagnostics.

The fix has a small precursor chain on main; bringing the headline #14715 alone doesn't apply cleanly because subsequent PRs introduced the test files and machinery the fix's diff targets. Included PRs (chronological):

…ocaml#14697)

Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
ocaml#14698)

…reviews

Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
…l#14715)

Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
@Alizter Alizter mentioned this pull request Jun 9, 2026
30 tasks
@Alizter

Alizter commented Jun 9, 2026

Copy link
Copy Markdown
Collaborator Author

@anmonteiro could you take a look to see if this makes sense to backport like this?

@Alizter Alizter added this to the 3.24.0 milestone Jun 9, 2026
@shonfeder

Copy link
Copy Markdown
Member

Discussed earlier today, we can move forward with merging the backport, but would still welcome consideration by @anmonteiro when they have time.

@shonfeder shonfeder merged commit 5c4a4c2 into ocaml:3.24.0-rc Jun 11, 2026
30 checks passed
@Alizter Alizter deleted the push-tomtrlvmqnpy branch June 11, 2026 09:30
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 participants