diff options
author | Cyril SIX <cyril.six@kalray.eu> | 2019-03-13 13:07:24 +0100 |
---|---|---|
committer | Cyril SIX <cyril.six@kalray.eu> | 2019-03-13 13:07:24 +0100 |
commit | 41c895850f75e3084fc8efdb7c9b1f7c8ec4fa5d (patch) | |
tree | 3126fa4af7ba97dbc4f4f841a81820c95a2e35a3 /configure | |
parent | 8f972659841ad38f6f548161b5ca3cfcbdd135cb (diff) | |
parent | 72ba1c282e2a8bfd0e826352a251fa71bfb71e05 (diff) | |
download | compcert-kvx-41c895850f75e3084fc8efdb7c9b1f7c8ec4fa5d.tar.gz compcert-kvx-41c895850f75e3084fc8efdb7c9b1f7c8ec4fa5d.zip |
Merge branch 'master' into mppa_postpass
Conflicts:
.gitignore
runtime/include/stdbool.h
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -528,19 +528,19 @@ missingtools=false echo "Testing Coq... " | tr -d '\n' coq_ver=$(${COQBIN}coqc -v 2>/dev/null | sed -n -e 's/The Coq Proof Assistant, version \([^ ]*\).*$/\1/p') case "$coq_ver" in - 8.6.1|8.7.0|8.7.1|8.7.2|8.8.0|8.8.1|8.8.2) + 8.6.1|8.7.0|8.7.1|8.7.2|8.8.0|8.8.1|8.8.2|8.9.0) echo "version $coq_ver -- good!";; ?*) echo "version $coq_ver -- UNSUPPORTED" if $ignore_coq_version; then echo "Warning: this version of Coq is unsupported, proceed at your own risks." else - echo "Error: CompCert requires one of the following Coq versions: 8.8.2, 8.8.1, 8.8.0, 8.7.2, 8.7.1, 8.7.0, 8.6.1" + echo "Error: CompCert requires one of the following Coq versions: 8.9.0, 8.8.2, 8.8.1, 8.8.0, 8.7.2, 8.7.1, 8.7.0, 8.6.1" missingtools=true fi;; "") echo "NOT FOUND" - echo "Error: make sure Coq version 8.8.1 is installed." + echo "Error: make sure Coq version 8.9.0 is installed." missingtools=true;; esac @@ -580,12 +580,13 @@ fi MENHIR_REQUIRED=20161201 MENHIR_NEW_API=20180530 +MENHIR_MAX=20181113 menhir_flags='' echo "Testing Menhir... " | tr -d '\n' menhir_ver=`menhir --version 2>/dev/null | sed -n -e 's/^.*version \([0-9]*\).*$/\1/p'` case "$menhir_ver" in 20[0-9][0-9][0-9][0-9][0-9][0-9]) - if test "$menhir_ver" -ge $MENHIR_REQUIRED; then + if test "$menhir_ver" -ge $MENHIR_REQUIRED -a "$menhir_ver" -le $MENHIR_MAX; then echo "version $menhir_ver -- good!" menhir_includes="-I `menhir --suggest-menhirLib`" if test "$menhir_ver" -ge $MENHIR_NEW_API; then @@ -593,7 +594,7 @@ case "$menhir_ver" in fi else echo "version $menhir_ver -- UNSUPPORTED" - echo "Error: CompCert requires Menhir version $MENHIR_REQUIRED or later." + echo "Error: CompCert requires a version of Menhir between $MENHIR_REQUIRED and $MENHIR_MAX, included." missingtools=true fi;; *) |