diff options
| author | Hugo Herbelin <Hugo.Herbelin@inria.fr> | 2017-12-08 23:38:28 (GMT) |
|---|---|---|
| committer | Hugo Herbelin <Hugo.Herbelin@inria.fr> | 2017-12-27 21:39:35 (GMT) |
| commit | be16dcb34d1d09aa9c850997b3ef3b0cc0e7a864 (patch) | |
| tree | 88be8e7a64e2f8230484246de8319207f82bd974 | |
| parent | ae8458862238fb5af5e19b1f0f7a82542296df44 (diff) | |
| download | coq-v8.2.zip coq-v8.2.tar.gz coq-v8.2.tar.bz2 | |
Adding support for OCaml 4.06.0 (option -unsafe-string needed).refs/pull/6362/headv8.2
And other minor changes.
Cherry-pick from v8.4 (7f2240f).
| -rw-r--r-- | INSTALL | 1 | ||||
| -rw-r--r-- | config/Makefile.template | 2 | ||||
| -rwxr-xr-x | configure | 12 |
3 files changed, 12 insertions, 3 deletions
@@ -47,6 +47,7 @@ WHAT DO YOU NEED ? For Ocaml version >= 3.10.0, you also need to install camlp5 (version <= 4.08, or >= 5.01 transitional) + - The num library if with Objective Caml version 4.06.0 or later - GNU Make version 3.81 or later ( diff --git a/config/Makefile.template b/config/Makefile.template index 5882b94..5459ee5 100644 --- a/config/Makefile.template +++ b/config/Makefile.template @@ -79,7 +79,7 @@ CAMLOPTLINK="NATIVECAMLC" CAMLMKTOP="CAMLMKTOPEXEC" # Caml flags -CAMLFLAGS=-rectypes CAMLANNOTATEFLAG CAMLWARNINGFLAG +CAMLFLAGS=-rectypes CAMLANNOTATEFLAG CAMLWARNINGFLAG CAMLSAFESTRINGFLAG # Compilation debug flags CAMLDEBUG=COQDEBUGFLAG @@ -106,6 +106,7 @@ coq_debug_flag_opt= coq_profile_flag= coq_annotate_flag= coq_warning_flag= +coq_safe_string_flag= best_compiler=opt cflags="-fno-defer-pop -Wall -Wno-unused" @@ -438,11 +439,17 @@ case $CAMLVERSION in CAMLP4COMPAT="-loc loc" echo "Warning: OCaml 4.02.0 suffers from a bug inducing" echo "very slow compilation times";; - ?*) + 4.0[0-5]*) # From 4.03.0, 4.00.0's warning 31, irrelevant for us, is fatal when activated CAMLP4COMPAT="-loc loc" coq_warning_flag="-w -31" echo "You have Objective-Caml $CAMLVERSION. Good!";; + ?*) + # From 4.06.0 + CAMLP4COMPAT="-loc loc" + coq_warning_flag="-w -31" + coq_safe_string_flag=-unsafe-string + echo "You have Objective-Caml $CAMLVERSION. Good!";; *) echo "I found the Objective-Caml compiler but cannot find its version number!" echo "Is it installed properly?" @@ -934,7 +941,7 @@ cat << END_OF_COQ_CONFIG > $mlconfig_file (* DO NOT EDIT THIS FILE: automatically generated by ../configure *) let local = $local -let coqrunbyteflags = "$ESCCOQRUNBYTEFLAGS $coq_warning_flag" +let coqrunbyteflags = "$ESCCOQRUNBYTEFLAGS $coq_warning_flag $coq_safe_string_flag" let coqlib = "$ESCLIBDIR" let coqsrc = "$ESCSRCDIR" let camlbin = "$ESCCAMLDIR" @@ -1016,6 +1023,7 @@ sed -e "s|LOCALINSTALLATION|$local|" \ -e "s|COQPROFILEFLAG|$coq_profile_flag|" \ -e "s|CAMLANNOTATEFLAG|$coq_annotate_flag|" \ -e "s|CAMLWARNINGFLAG|$coq_warning_flag|" \ + -e "s|CAMLSAFESTRINGFLAG|$coq_safe_string_flag|" \ -e "s|CCOMPILEFLAGS|$cflags|" \ -e "s|BESTCOMPILER|$best_compiler|" \ -e "s|DLLEXTENSION|$DLLEXT|" \ |