diff options
| author |  Maxime Dénès <mail@maximedenes.fr> | 2017-05-30 08:10:42 +0200 |
|---|---|---|
| committer | Maxime Dénès <mail@maximedenes.fr> | 2017-05-30 08:10:42 +0200 |
| commit | ba3ccf80a44f0e06ee6e622a30f99de6804d005e (patch) | |
| tree | e070e15d3e6cb54ba97601d938711cad7df64299 /configure.ml | |
| parent | 0336d4d19d446315cb922149b8ee4e7885843be0 (diff) | |
| parent | b30a6b141fed01a62330051bfb92c19564c93215 (diff) | |
Merge PR#692: Fail on deprecated warning even for Ocaml > 4.02.3
Diffstat (limited to 'configure.ml')
| -rw-r--r-- | configure.ml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/configure.ml b/configure.ml index 7af18cb85..a2aabb49c 100644 --- a/configure.ml +++ b/configure.ml @@ -515,7 +515,6 @@ let camltag = match caml_version_list with | _ -> assert false (** Explanation of disabled warnings: - 3: deprecated warning (not error for non minimum supported ocaml) 4: fragile pattern matching: too common in the code and too annoying to avoid in general 9: missing fields in a record pattern: too common in the code and not worth the bother 27: innocuous unused variable: innocuous @@ -533,7 +532,7 @@ let coq_warn_flags = if !Prefs.warn_error then "-warn-error +a" ^ (if caml_version_nums > [4;2;3] - then "-3-56" + then "-56" else "") else "" in @@ -598,9 +597,11 @@ let config_camlpX () = let camlp5mod = "gramlib" in let camlp5libdir, camlp5o = check_camlp5 (camlp5mod^".cma") in let camlp5_version = check_camlp5_version camlp5o in - "camlp5", camlp5o, Filename.dirname camlp5o, camlp5libdir, camlp5mod, camlp5_version + "camlp5", "Camlp5", camlp5o, Filename.dirname camlp5o, camlp5libdir, camlp5mod, camlp5_version -let camlpX, camlpXo, camlpXbindir, fullcamlpXlibdir, camlpXmod, camlpX_version = config_camlpX () +let camlpX, capitalized_camlpX, camlpXo, + camlpXbindir, fullcamlpXlibdir, + camlpXmod, camlpX_version = config_camlpX () let shorten_camllib s = if starts_with s (camllib^"/") then @@ -959,9 +960,9 @@ let print_summary () = pr " OCaml version : %s\n" caml_version; pr " OCaml binaries in : %s\n" camlbin; pr " OCaml library in : %s\n" camllib; - pr " %s version : %s\n" (String.capitalize camlpX) camlpX_version; - pr " %s binaries in : %s\n" (String.capitalize camlpX) camlpXbindir; - pr " %s library in : %s\n" (String.capitalize camlpX) camlpXlibdir; + pr " %s version : %s\n" capitalized_camlpX camlpX_version; + pr " %s binaries in : %s\n" capitalized_camlpX camlpXbindir; + pr " %s library in : %s\n" capitalized_camlpX camlpXlibdir; if best_compiler = "opt" then pr " Native dynamic link support : %B\n" hasnatdynlink; if coqide <> "no" then |