diff --git a/tools/.depend b/tools/.depend index 109cb1f3f..442ebd4f5 100644 --- a/tools/.depend +++ b/tools/.depend @@ -135,8 +135,10 @@ ocamlmklib.cmx : \ ocamlmklibconfig.cmo : ocamlmklibconfig.cmx : ocamlmktop.cmo : \ + ../utils/config.cmi \ ../utils/ccomp.cmi ocamlmktop.cmx : \ + ../utils/config.cmx \ ../utils/ccomp.cmx ocamloptp.cmo : \ ../driver/main_args.cmi diff --git a/tools/ocamlmktop.ml b/tools/ocamlmktop.ml index ab333966a..2b47ebb07 100644 --- a/tools/ocamlmktop.ml +++ b/tools/ocamlmktop.ml @@ -20,9 +20,8 @@ let _ = cmd.exe has special quoting rules (see 'cmd.exe /?' for details). Short version: if the string passed to cmd.exe starts with '"', the first and last '"' are removed *) - let ocamlc,extra_quote = - if Sys.win32 then "ocamlc.exe","\"" else "ocamlc","" - in + let ocamlc = "ocamlc" ^ Config.ext_exe in + let extra_quote = if Sys.win32 then "\"" else "" in let ocamlc = Filename.(quote (concat (dirname ocamlmktop) ocamlc)) in let cmdline = extra_quote ^ ocamlc ^ " -I +compiler-libs -linkall ocamlcommon.cma " ^