diff options
| author | Pierre Letouzey | 2014-03-02 00:17:29 +0100 |
|---|---|---|
| committer | Pierre Letouzey | 2014-03-02 20:00:03 +0100 |
| commit | 9130ea9cbc657cd7adf02830e40a89f6de3953f3 (patch) | |
| tree | e0152f4442dadf8cc49f12a2cc42817515691461 /dev/doc/patch.ocaml-3.10.drop.rectypes | |
| parent | f694544d016b085b3cd10007b9f7716ae2c3b022 (diff) | |
Set officially the minimal OCaml requirement to 3.12.1
Anyway, a few syntactic features of 3.12 were already used here and
there (e.g. local opening via Foo.(...), or the record shortcut
{ field; ... }). Hence compiling with 3.11 wasn't working anymore.
Already take advantage of the following 3.12.1 features :
- "module type of ..." in CArray, CList, CString ...
- "ocamldep -ml-synonym" : no need anymore to hack the ocamldep output
via our coqdep to localize the .ml4 modules :-)
The -ml-synonym option (+ various bugfixes) is the reason for asking
3.12.1 directly and not just 3.12.0. After all, if debian stable is
providing 3.12.1, then everybody has it ;-)
Diffstat (limited to 'dev/doc/patch.ocaml-3.10.drop.rectypes')
| -rw-r--r-- | dev/doc/patch.ocaml-3.10.drop.rectypes | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/dev/doc/patch.ocaml-3.10.drop.rectypes b/dev/doc/patch.ocaml-3.10.drop.rectypes deleted file mode 100644 index ba7a3e9504..0000000000 --- a/dev/doc/patch.ocaml-3.10.drop.rectypes +++ /dev/null @@ -1,31 +0,0 @@ -Index: scripts/coqmktop.ml -=================================================================== ---- scripts/coqmktop.ml (révision 12084) -+++ scripts/coqmktop.ml (copie de travail) -@@ -231,12 +231,25 @@ - end;; - - let ppf = Format.std_formatter;; -+ let set_rectypes_hack () = -+ if String.length (Sys.ocaml_version) >= 4 & -+ String.sub (Sys.ocaml_version) 0 4 = \"3.10\" -+ then -+ (* ocaml 3.10 does not have #rectypes but needs it *) -+ (* simulate a call with option -rectypes before *) -+ (* jumping to the ocaml toplevel *) -+ for i = 1 to Array.length Sys.argv - 1 do -+ Sys.argv.(i) <- \"-rectypes\" -+ done -+ else -+ () in -+ - Mltop.set_top - {Mltop.load_obj= - (fun f -> if not (Topdirs.load_file ppf f) then failwith \"error\"); - Mltop.use_file=Topdirs.dir_use ppf; - Mltop.add_dir=Topdirs.dir_directory; -- Mltop.ml_loop=(fun () -> Toploop.loop ppf) };;\n" -+ Mltop.ml_loop=(fun () -> set_rectypes_hack(); Topmain.main()) };;\n" - - (* create a temporary main file to link *) - let create_tmp_main_file modules = |
