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.16] backport: #11009 #10962 #11051

Merged
merged 6 commits into from
Oct 30, 2024
Merged

[3.16] backport: #11009 #10962 #11051

merged 6 commits into from
Oct 30, 2024

Conversation

maiste
Copy link
Collaborator

@maiste maiste commented Oct 29, 2024

This PR backports #11009 and #10962. They are backported together as one is the fix of the other one.

kit-ty-kate and others added 3 commits October 29, 2024 13:53
…10962)

* Call the C++ compiler with -std=c++11 when using OCaml >= 5.0

Signed-off-by: Etienne Marais <[email protected]>
strdup is not part of the C standard library but is part of POSIX.
By default GCC and Clang both use the GNU variant of the C standard,
so we are using strdup here to ensure users have access to it by default.
If -std=c++11 is used instead of -std=gnu++11 this would fail to compile
on non-POSIX platforms such as Cygwin.

Signed-off-by: Kate <[email protected]>
Signed-off-by: Etienne Marais <[email protected]>
Signed-off-by: Etienne Marais <[email protected]>
@maiste maiste changed the title backport: Fix the compilation of OCaml 5 programs on Cygwin (#11009) backport: #11009 #10962 Oct 29, 2024
@maiste maiste marked this pull request as ready for review October 29, 2024 15:19
@Leonidas-from-XIV Leonidas-from-XIV changed the title backport: #11009 #10962 [3.16] backport: #11009 #10962 Oct 29, 2024
src/ocaml/version.ml Outdated Show resolved Hide resolved
src/ocaml/version.mli Outdated Show resolved Hide resolved
Copy link
Collaborator Author

@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.

Let see if the tests succeed. If that's the case, I'll commit these changes.

src/ocaml/version.ml Outdated Show resolved Hide resolved
src/ocaml/version.mli Outdated Show resolved Hide resolved
Signed-off-by: Etienne Marais <[email protected]>
Signed-off-by: Etienne Marais <[email protected]>
@maiste maiste merged commit 6f61ed5 into ocaml:3.16 Oct 30, 2024
23 of 28 checks passed
@maiste maiste deleted the backport-11009 branch October 30, 2024 09:12
@maiste maiste mentioned this pull request Oct 30, 2024
9 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.

3 participants