diff options
| author |  letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2013-01-12 20:02:48 +0000 |
|---|---|---|
| committer | letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2013-01-12 20:02:48 +0000 |
| commit | 2299413926668ff322cfd139e78299b4733eacd0 (patch) | |
| tree | bdf4535ebb80f90b1b25ace7b1c217ba603d1f04 /lib/envars.ml | |
| parent | 0214cf25a5572afc4fa47cf337c8de8eac7501fc (diff) | |
Envar: in w32, add .exe when searching for caml binaries
Based on a patch by Pierre-Yves Strub
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16124 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'lib/envars.ml')
| -rw-r--r-- | lib/envars.ml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/envars.ml b/lib/envars.ml index a5eb827fe..8e7baa082 100644 --- a/lib/envars.ml +++ b/lib/envars.ml @@ -147,7 +147,9 @@ let coqpath = (** {2 Caml paths} *) -let guess_camlbin () = which (user_path ()) "ocamlc" +let exe s = s ^ Coq_config.exec_extension + +let guess_camlbin () = which (user_path ()) (exe "ocamlc") let camlbin () = if !Flags.camlbin_spec then !Flags.camlbin else @@ -168,7 +170,7 @@ let camllib () = (** {2 Camlp4 paths} *) -let guess_camlp4bin () = which (user_path ()) Coq_config.camlp4 +let guess_camlp4bin () = which (user_path ()) (exe Coq_config.camlp4) let camlp4bin () = if !Flags.camlp4bin_spec then !Flags.camlp4bin else @@ -176,7 +178,7 @@ let camlp4bin () = try guess_camlp4bin () with _ -> - if Sys.file_exists (camlbin () / Coq_config.camlp4) then + if Sys.file_exists (camlbin () / exe Coq_config.camlp4) then camlbin () else Coq_config.camlp4bin |