Skip to content

Conversation

@xavierleroy
Copy link
Contributor

This is a fix for #329, alternate to #330, in that it supports both old and new versions of Menhir.

Since Menhir version 20200123, we need to link with menhirLib.cmxa instead of menhirLib.cmx.

This commit chooses automatically the file to link with:

  • menhirLib.cmxa if it exists in the menhirLib installation directory,
  • menhirLib.cmx otherwise.

To reliably find the installation directory, configure was changed to record the menhirLib directory in Makefile.config, variable MENHIR_DIR, instead of a pre-cooked command-line option MENHIR_INCLUDES.

Makefile.extr was adapted accordingly.

Since Menhir version 20200123, we need to link with menhirLib.cmxa
instead of menhirLib.cmx.

This commit chooses automatically the file to link with:
menhirLib.cmxa if it exists in the menhirLib installation directory,
menhirLib.cmx otherwise.

To reliably find the installation directory, configure was changed
to record the menhirLib directory in Makefile.config, variable MENHIR_DIR,
instead of a pre-cooked command-line option MENHIR_INCLUDES.

Makefile.extr was adapted accordingly.

Fixes: #329
Closes: #330
@bschommer
Copy link
Member

Sorry for the late reply, this works for us and should fix the menhir issue.

@xavierleroy xavierleroy merged commit 6950ac8 into master Feb 5, 2020
@xavierleroy xavierleroy deleted the menhir-configuration branch May 2, 2020 12:29
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