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

[3.17] (no_dynlink): do not build .cmxs (#11176) #11189

Merged
merged 2 commits into from
Dec 16, 2024

Conversation

nojb
Copy link
Collaborator

@nojb nojb commented Dec 9, 2024

Cherry-pick of #11176 to 3.17. cc @maiste

* Do not build .cmxs when library is (no_dynlink)

Signed-off-by: Nicolás Ojeda Bär <[email protected]>

* Add test

Signed-off-by: Nicolás Ojeda Bär <[email protected]>

* Changes

Signed-off-by: Nicolás Ojeda Bär <[email protected]>

* Improve test

Signed-off-by: Nicolás Ojeda Bär <[email protected]>

* Add test

Signed-off-by: Nicolás Ojeda Bär <[email protected]>

---------

Signed-off-by: Nicolás Ojeda Bär <[email protected]>
(cherry picked from commit 41212a5)
@maiste maiste added the release PR or issue for releasing a new dune version label Dec 9, 2024
@maiste maiste self-requested a review December 9, 2024 13:01
@Leonidas-from-XIV
Copy link
Collaborator

The failure is on macOS CI is fixed via #11179.

The macos patch utility doesn't like it when a patch contains no hunks,
so this change adds a hunk to the patch used in the ignored-dune-lock
test.

Signed-off-by: Stephen Sherratt <[email protected]>
@maiste maiste mentioned this pull request Dec 16, 2024
11 tasks
Copy link
Collaborator

@maiste maiste left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have also used this PR to backport the fix that makes the CI happy on MacOS. The review already being done in the past and the rereview seems good.
LGTM 👍

@nojb nojb merged commit 7102ef7 into ocaml:3.17 Dec 16, 2024
28 checks passed
@nojb nojb deleted the no_dynlink_cmxs_3_17 branch December 16, 2024 13:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release PR or issue for releasing a new dune version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants