diff options
| author | Xavier Leroy <xavierleroy@users.noreply.github.com> | 2020-02-05 18:36:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-05 18:36:08 +0100 |
| commit | 6950ac8fb096768cb3811ae7f89d0db080bf965a (patch) | |
| tree | 9070ec9c2d6bf1277de5df13366b538f7c381e80 /Makefile.extr | |
| parent | b0fdbb0e88d6decd068709ea673dbe51fd6727b0 (diff) | |
| download | compcert-kvx-6950ac8fb096768cb3811ae7f89d0db080bf965a.tar.gz compcert-kvx-6950ac8fb096768cb3811ae7f89d0db080bf965a.zip | |
Revised menhirLib autoconfiguration (#331)
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
Diffstat (limited to 'Makefile.extr')
| -rw-r--r-- | Makefile.extr | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.extr b/Makefile.extr index d375fd29..7b59ed24 100644 --- a/Makefile.extr +++ b/Makefile.extr @@ -55,7 +55,7 @@ extraction/%.cmo: WARNINGS +=-w -20-27-32..34-39-41-44..45-60 cparser/pre_parser.cmx: WARNINGS += -w -41 cparser/pre_parser.cmo: WARNINGS += -w -41 -COMPFLAGS+=-g $(INCLUDES) $(MENHIR_INCLUDES) $(WARNINGS) +COMPFLAGS+=-g $(INCLUDES) -I "$(MENHIR_DIR)" $(WARNINGS) # Using .opt compilers if available |