From a4c7f8bd98be2a200489325ff7c5061cf80ab4f3 Mon Sep 17 00:00:00 2001
From: Enrico Tassi <gareuselesinge@debian.org>
Date: Tue, 27 Dec 2016 16:53:30 +0100
Subject: Imported Upstream version 8.6

---
 tools/coqmktop.ml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'tools/coqmktop.ml')

diff --git a/tools/coqmktop.ml b/tools/coqmktop.ml
index a45c625b..eaf938e8 100644
--- a/tools/coqmktop.ml
+++ b/tools/coqmktop.ml
@@ -149,7 +149,7 @@ let usage () =
   prerr_endline "Usage: coqmktop <options> <ocaml options> files\
 \nFlags are:\
 \n  -coqlib dir    Specify where the Coq object files are\
-\n  -camlbin dir   Specify where the OCaml binaries are\
+\n  -ocamlfind dir Specify where the ocamlfind binary is\
 \n  -camlp4bin dir Specify where the Camlp4/5 binaries are\
 \n  -o exec-file   Specify the name of the resulting toplevel\
 \n  -boot          Run in boot mode\
@@ -167,8 +167,8 @@ let parse_args () =
     (* Directories *)
     | "-coqlib" :: d :: rem ->
 	Flags.coqlib_spec := true; Flags.coqlib := d ; parse (op,fl) rem
-    | "-camlbin" :: d :: rem ->
-	Flags.camlbin_spec := true; Flags.camlbin := d ; parse (op,fl) rem
+    | "-ocamlfind" :: d :: rem ->
+	Flags.ocamlfind_spec := true; Flags.ocamlfind := d ; parse (op,fl) rem
     | "-camlp4bin" :: d :: rem ->
 	Flags.camlp4bin_spec := true; Flags.camlp4bin := d ; parse (op,fl) rem
     | "-R" :: d :: rem -> parse (incl_all_subdirs d op,fl) rem
@@ -235,7 +235,7 @@ let declare_loading_string () =
 \n     Mltop.set_top\
 \n       {Mltop.load_obj=\
 \n         (fun f -> if not (Topdirs.load_file ppf f)\
-\n                   then Errors.error (\"Could not load plugin \"^f));\
+\n                   then CErrors.error (\"Could not load plugin \"^f));\
 \n        Mltop.use_file=Topdirs.dir_use ppf;\
 \n        Mltop.add_dir=Topdirs.dir_directory;\
 \n        Mltop.ml_loop=(fun () -> Toploop.loop ppf) };;\
@@ -265,11 +265,10 @@ let create_tmp_main_file modules =
 let main () =
   let (options, userfiles) = parse_args () in
   (* Directories: *)
-  let () = Envars.set_coqlib ~fail:Errors.error in
-  let camlbin = Envars.camlbin () in
+  let () = Envars.set_coqlib ~fail:CErrors.error in
   let basedir = if !Flags.boot then None else Some (Envars.coqlib ()) in
   (* Which ocaml compiler to invoke *)
-  let prog = camlbin/(if !opt then "ocamlopt" else "ocamlc") in
+  let prog = if !opt then "opt" else "ocamlc" in
   (* Which arguments ? *)
   if !opt && !top then failwith "no custom toplevel in native code !";
   let flags = if !opt then [] else Coq_config.vmbyteflags in
@@ -284,14 +283,14 @@ let main () =
       (std_includes basedir) @ tolink @ [ main_file ] @ topstart
     in
     if !echo then begin
-      let command = String.concat " " (prog::args) in
+      let command = String.concat " " (Envars.ocamlfind ()::prog::args) in
       print_endline command;
       print_endline
 	("(command length is " ^
 	    (string_of_int (String.length command)) ^ " characters)");
       flush Pervasives.stdout
     end;
-    let exitcode = run_command prog args in
+    let exitcode = run_command (Envars.ocamlfind ()) (prog::args) in
     clean main_file;
     exitcode
   with reraise -> clean main_file; raise reraise
-- 
cgit v1.2.3