diff options
author | Enrico Tassi <gareuselesinge@debian.org> | 2015-01-25 14:43:16 +0100 |
---|---|---|
committer | Enrico Tassi <gareuselesinge@debian.org> | 2015-01-25 14:43:16 +0100 |
commit | f219abfed720305c13875c3c63f9240cf63f78bc (patch) | |
tree | 69d2c026916128fdb50b8d1c0dbf1be451340d30 /dev/doc/patch.ocaml-3.10.drop.rectypes | |
parent | 476d60ef0fe0ac015c1e902204cdd7029e10ef0f (diff) | |
parent | cec4741afacd2e80894232850eaf9f9c0e45d6d7 (diff) |
Merge tag 'upstream/8.5_beta1+dfsg'
Upstream version 8.5~beta1+dfsg
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 ba7a3e95..00000000 --- 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 = |