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

OCaml 4.13 support #95

Merged
merged 2 commits into from
Sep 27, 2021
Merged

OCaml 4.13 support #95

merged 2 commits into from
Sep 27, 2021

Conversation

kit-ty-kate
Copy link
Contributor

Simply #94 with the addition of CI to show it works.

OCaml 4.13.0 got released a few hours ago.

@hannesm
Copy link
Member

hannesm commented Sep 27, 2021

thanks.

@hannesm hannesm merged commit 940b9fd into mirage:master Sep 27, 2021
@@ -46,6 +46,9 @@ ocaml/Makefile.config: ocaml/Makefile
CPPFLAGS="$(OCAML_CFLAGS)" \
./configure --host=$(BUILD_ARCH)-unknown-none
echo "ARCH=$(OCAML_BUILD_ARCH)" >> ocaml/Makefile.config
echo 'SAK_CC=cc' >> ocaml/Makefile.config
echo 'SAK_CFLAGS=$(OC_CFLAGS) $(OC_CPPFLAGS)' >> ocaml/Makefile.config
echo 'SAK_LINK=$(SAK_CC) $(SAK_CFLAGS) $(OUTPUTEXE)$(1) $(2)' >> ocaml/Makefile.config
Copy link
Member

Choose a reason for hiding this comment

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

What is the purpose of these options?

Copy link
Member

Choose a reason for hiding this comment

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

Thanks for your comment. The build system of OCaml changed due to iconv not available on Windows (see ocaml/ocaml#10451). Now, it ships and uses during build a small C utility (called sak) that performs the job iconv used to do. Thanks to last-minute addition in ocaml/ocaml#10635 we can use the host C compiler only for sak (which we do here) to succeed the build (since the modified C compiler & flags of our cross-build is not able to compile, link, and execute sak).

I hope this answers your question.

Copy link
Member

Choose a reason for hiding this comment

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

Thanks, I see, I re-updated #92 with the current status of master but I would like a double-check from you and @TheLortex.

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.

None yet

4 participants