aboutsummaryrefslogtreecommitdiff
path: root/toplevel
diff options
context:
space:
mode:
authorPierre-Marie Pédrot2015-12-15 10:30:31 +0100
committerPierre-Marie Pédrot2015-12-15 10:38:52 +0100
commitdb282f831cbf619e417593c602de24960c3ca69c (patch)
tree6f4bcc1830e37713c571e58084214571c8920ff1 /toplevel
parentf439001caa24671d03d8816964ceb8e483660e70 (diff)
parentce395ca02311bbe6ecc1b2782e74312272dd15ec (diff)
Merge branch 'v8.5'
Diffstat (limited to 'toplevel')
-rw-r--r--toplevel/coqtop.ml7
1 files changed, 6 insertions, 1 deletions
diff --git a/toplevel/coqtop.ml b/toplevel/coqtop.ml
index 4852a6d332..5e782233f2 100644
--- a/toplevel/coqtop.ml
+++ b/toplevel/coqtop.ml
@@ -196,6 +196,11 @@ let require () =
let map dir = Qualid (Loc.ghost, qualid_of_string dir) in
Vernacentries.vernac_require None (Some false) (List.rev_map map !require_list)
+let add_compat_require v =
+ match v with
+ | Flags.V8_4 -> add_require "Coq.Compat.Coq84"
+ | _ -> ()
+
let compile_list = ref ([] : (bool * string) list)
let glob_opt = ref false
@@ -475,7 +480,7 @@ let parse_args arglist =
|"-async-proofs-private-flags" ->
Flags.async_proofs_private_flags := Some (next ());
|"-worker-id" -> set_worker_id opt (next ())
- |"-compat" -> Flags.compat_version := get_compat_version (next ())
+ |"-compat" -> let v = get_compat_version (next ()) in Flags.compat_version := v; add_compat_require v
|"-compile" -> add_compile false (next ())
|"-compile-verbose" -> add_compile true (next ())
|"-dump-glob" -> Dumpglob.dump_into_file (next ()); glob_opt := true