diff options
| author | Nicolas Pouillard <np@nicolaspouillard.fr> | 2007-02-26 16:36:33 +0000 |
|---|---|---|
| committer | Nicolas Pouillard <np@nicolaspouillard.fr> | 2007-02-26 16:36:33 +0000 |
| commit | 58381e7eccfc12df48883ab7cdf29d9409fb6f78 (patch) | |
| tree | 97d72572942b4ed27d00318edaba392cbb4e11af | |
| parent | 9286d93c3371194d0bae3f24c599458968f5ef76 (diff) | |
[ocamlbuild] Use Sys.is_directory
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7930 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | ocamlbuild/my_unix.ml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ocamlbuild/my_unix.ml b/ocamlbuild/my_unix.ml index 0e9514444..0c8d4e9c6 100644 --- a/ocamlbuild/my_unix.ml +++ b/ocamlbuild/my_unix.ml @@ -51,10 +51,12 @@ let is_degraded = true let stat f = { stat_key = f; stat_file_kind = - try let _ = with_input_file f input_char in FK_file - with - | Sys_error "Is a directory" -> FK_dir - | End_of_file -> FK_file } + if Sys.file_exists f then + if Sys.is_directory f then + FK_dir + else + FK_file + else let _ = with_input_file f input_char in assert false } let run_and_open s kont = with_temp_file "ocamlbuild" "out" begin fun tmp -> |