diff options
| author | Michael Soegtrop | 2020-06-07 14:35:06 +0200 |
|---|---|---|
| committer | Théo Zimmermann | 2020-06-10 13:11:24 +0200 |
| commit | 628ed5960ab22a0cac040c536c99d5d4e38d43d8 (patch) | |
| tree | 973b3365f85ce6610429b42095fe37deafd5045e /dev/build | |
| parent | 95be052f60b1b6b4cc0b12e92b3d1b86b5bd7ca9 (diff) | |
Windows: fix menhir and coq-menhirlib build for latest version.
Diffstat (limited to 'dev/build')
| -rwxr-xr-x | dev/build/windows/makecoq_mingw.sh | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/dev/build/windows/makecoq_mingw.sh b/dev/build/windows/makecoq_mingw.sh index 4a6555a4f7..43ffb37477 100755 --- a/dev/build/windows/makecoq_mingw.sh +++ b/dev/build/windows/makecoq_mingw.sh @@ -1087,11 +1087,10 @@ function make_menhir { make_ocaml make_findlib make_ocamlbuild - # This is the version required by latest CompCert - if build_prep https://gitlab.inria.fr/fpottier/menhir/-/archive/20190626 menhir-20190626 tar.gz 1 ; then - # Note: menhir doesn't support -j 8, so don't pass MAKE_OPT - log2 make all PREFIX="$PREFIXOCAML" - log2 make install PREFIX="$PREFIXOCAML" + if build_prep https://gitlab.inria.fr/fpottier/menhir/-/archive/20200525 menhir-20200525 tar.gz 1 ; then + # ToDo: don't know if this is the intended / most reliable to do it, but it works + log2 dune build @install + log2 dune install menhir menhirSdk menhirLib build_post fi } @@ -1712,10 +1711,8 @@ function make_addon_menhir { touch "$FLAGFILES/menhir-addon.started" # Menhir executable install_glob "$PREFIXOCAML/bin" 'menhir.exe' "$PREFIXCOQ/bin/" - # Menhir Standard library - install_glob "$PREFIXOCAML/share/menhir/" '*.mly' "$PREFIXCOQ/share/menhir/" # Menhir PDF doc - install_glob "$PREFIXOCAML/share/doc/menhir/" '*.pdf' "$PREFIXCOQ/doc/menhir/" + install_glob "$PREFIXOCAML/doc/menhir/" '*.pdf' "$PREFIXCOQ/doc/menhir/" touch "$FLAGFILES/menhir-addon.finished" LOGTARGET=other installer_addon_end @@ -1730,7 +1727,8 @@ function make_addon_menhirlib { if build_prep_overlay menhirlib; then installer_addon_section menhirlib "Menhirlib" "Coq support library for using Menhir generated parsers in Coq" "" # The supplied makefiles don't work in any way on cygwin - cd src + # ToDo: dune also doesn't seem to work for the coq files + cd coq-menhirlib/src echo -R . MenhirLib > _CoqProject ls -1 *.v >> _CoqProject log1 coq_makefile -f _CoqProject -o Makefile.coq |