From efb623bd0a40c5b0903e4a46bc795e3b9e766bce Mon Sep 17 00:00:00 2001 From: herbelin Date: Tue, 4 Feb 2003 16:04:37 +0000 Subject: Contournement de ocamlmktop qui plante sous win32 git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@3657 85f007b7-540e-0410-9357-904b9bb8a0f7 --- scripts/coqmktop.ml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/coqmktop.ml b/scripts/coqmktop.ml index 8c73b9c5e..6f65d324b 100644 --- a/scripts/coqmktop.ml +++ b/scripts/coqmktop.ml @@ -276,8 +276,10 @@ let main () = if !top then failwith "no custom toplevel in native code !"; "ocamlopt -linkall" end else - (* bytecode *) - if !top then "ocamlmktop -custom -linkall" else "ocamlc -custom -linkall" + (* bytecode (we shunt ocamlmktop script which fails on win32) *) + let ocamlmktoplib = " toplevellib.cma" in + let ocamlccustom = "ocamlc -custom -linkall" in + (if !top then ocamlccustom^ocamlmktoplib else ocamlccustom) in (* files to link *) let (modules, tolink) = files_to_link userfiles in @@ -292,6 +294,8 @@ let main () = let main_file = create_tmp_main_file modules in try let args = options @ (includes ()) @ tolink @ dynlink @ [ main_file ] in + (* add topstart.cmo explicitly because we shunted ocamlmktop wrapper *) + let args = if !top then args @ [ "topstart.cmo" ] else args in (* Now, with the .cma, we MUST use the -linkall option *) let command = String.concat " " ((prog^" -linkall")::args) in if !echo then begin print_endline command; flush Pervasives.stdout end; -- cgit v1.2.3