Skip to content

[3.24.1] Backport #14904#15457

Open
shonfeder wants to merge 1 commit into
3.24.1-rcfrom
backport-14904
Open

[3.24.1] Backport #14904#15457
shonfeder wants to merge 1 commit into
3.24.1-rcfrom
backport-14904

Conversation

@shonfeder

Copy link
Copy Markdown
Member

Backport #14904 onto 3.24.1

Replaces #15451, which was incorrectly targeting main.

…14904)

When generating jsoo library archive rules on demand, resolve the
library stanza the same way Ml_sources does: evaluate enabled_if and
pick the enabled stanza rather than the first one matching by name.

Fixes an internal error (modules_and_obj_dir: failed lookup) when a dune
file defines two libraries with the same name distinguished by mutually
exclusive enabled_if clauses, as ocaml-re does for ppx_expect_common.

Fixes #14775.

(cherry picked from commit b0313ac)
Signed-off-by: Shon Feder <shon.feder@gmail.com>
@shonfeder shonfeder changed the title jsoo: respect enabled_if when resolving libraries for archive rules (… [3.24.1] Backport #14904 Jul 9, 2026
@shonfeder shonfeder mentioned this pull request Jul 9, 2026
22 tasks
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.

2 participants