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

Fix FlexDLL bootstrap when system flexlink found #779

Merged
merged 1 commit into from Aug 25, 2016

Conversation

Projects
None yet
3 participants
@dra27
Copy link
Contributor

commented Aug 25, 2016

Building the native runtime could accidentally pick up the wrong include
directory for flexdll.h.

Background in https://sympa.inria.fr/sympa/arc/caml-list/2016-06/msg00123.html

Fix FlexDLL bootstrap when system flexlink found
Building the native runtime could accidentally pick up the wrong include
directory for flexdll.h.

Background in https://sympa.inria.fr/sympa/arc/caml-list/2016-06/msg00123.html

@alainfrisch alainfrisch merged commit 5d1b524 into ocaml:4.04 Aug 25, 2016

1 check was pending

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
@alainfrisch

This comment has been minimized.

Copy link
Contributor

commented Aug 25, 2016

Thanks!

@dra27

This comment has been minimized.

Copy link
Contributor Author

commented Aug 25, 2016

Hah - you were too quick! I had a Changes entry to add too! 😄

@dra27

This comment has been minimized.

Copy link
Contributor Author

commented Aug 25, 2016

Could you cherry-pick dra27@e44ccfe?

@dra27

This comment has been minimized.

Copy link
Contributor Author

commented Aug 25, 2016

(the whole thing should also needs to go to trunk; or is that done en masse after release?)

@alainfrisch

This comment has been minimized.

Copy link
Contributor

commented Aug 25, 2016

Done for the cherry-pick (since the bootstrapping was a new feature in 4.04 and this was a fix for it, I did not require a Changes entry but I'm fine with it!).

I suspect 4.04 will be merged to trunk at some point(s). @damiendoligez Can you confirm?

@dra27

This comment has been minimized.

Copy link
Contributor Author

commented Aug 25, 2016

The bootstrapping is in 4.03!

@alainfrisch

This comment has been minimized.

Copy link
Contributor

commented Aug 25, 2016

Ah, sorry. Old habits: since we are close to a new release, I somehow thought the previous one was necessarily very old 😄

@damiendoligez

This comment has been minimized.

Copy link
Member

commented Aug 31, 2016

I suspect 4.04 will be merged to trunk at some point(s). @damiendoligez Can you confirm?

Yes, but the more you cherry-pick, the easier it will be for me. For such a small change it's no problem either way.

dra27 added a commit to dra27/ocaml that referenced this pull request Dec 10, 2016

Fix FlexDLL bootstrap when system flexlink found (ocaml#779)
Building the native runtime could accidentally pick up the wrong include
directory for flexdll.h.

Background in https://sympa.inria.fr/sympa/arc/caml-list/2016-06/msg00123.html

dra27 added a commit to dra27/ocaml that referenced this pull request Dec 10, 2016

Fix FlexDLL bootstrap when system flexlink found (ocaml#779)
Building the native runtime could accidentally pick up the wrong include
directory for flexdll.h.

Background in https://sympa.inria.fr/sympa/arc/caml-list/2016-06/msg00123.html

dra27 added a commit to dra27/ocaml that referenced this pull request Dec 12, 2016

Fix FlexDLL bootstrap when system flexlink found (ocaml#779)
Building the native runtime could accidentally pick up the wrong include
directory for flexdll.h.

Background in https://sympa.inria.fr/sympa/arc/caml-list/2016-06/msg00123.html

dra27 added a commit to dra27/ocaml that referenced this pull request Dec 14, 2016

Fix FlexDLL bootstrap when system flexlink found (ocaml#779)
Building the native runtime could accidentally pick up the wrong include
directory for flexdll.h.

Background in https://sympa.inria.fr/sympa/arc/caml-list/2016-06/msg00123.html

dra27 added a commit that referenced this pull request Dec 14, 2016

Fix FlexDLL bootstrap when system flexlink found (#779)
Building the native runtime could accidentally pick up the wrong include
directory for flexdll.h.

Background in https://sympa.inria.fr/sympa/arc/caml-list/2016-06/msg00123.html

camlspotter pushed a commit to camlspotter/ocaml that referenced this pull request Oct 17, 2017

Fix FlexDLL bootstrap when system flexlink found (ocaml#779)
Building the native runtime could accidentally pick up the wrong include
directory for flexdll.h.

Background in https://sympa.inria.fr/sympa/arc/caml-list/2016-06/msg00123.html
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.