tjh.dev
1diff --git a/config/xConfigurator.ml b/config/xConfigurator.ml
2index 766a35c..1d1aff5 100644
3--- a/config/xConfigurator.ml
4+++ b/config/xConfigurator.ml
5@@ -8,7 +8,7 @@ let (!%) fmt = Printf.sprintf fmt
6 module Configurator = struct
7 include Configurator.V1
8
9- let ( ^/ ) = Caml.Filename.concat
10+ let ( ^/ ) = Stdlib.Filename.concat
11
12 let path_sep =
13 if Sys.win32 then
14@@ -19,7 +19,7 @@ module Configurator = struct
15 let exe = if Sys.win32 then ".exe" else ""
16
17 let get_path () =
18- match Caml.Sys.getenv "PATH" with
19+ match Stdlib.Sys.getenv "PATH" with
20 | exception Not_found -> []
21 | s -> String.split ~on:path_sep s
22
23@@ -27,7 +27,7 @@ module Configurator = struct
24 List.find_map dirs ~f:(fun dir ->
25 List.find_map bases ~f:(fun base ->
26 let path = dir ^/ base in
27- if Caml.Sys.file_exists path then Some path else None))
28+ if Stdlib.Sys.file_exists path then Some path else None))
29
30 let find_program prog =
31 let prog = prog ^ exe in
32@@ -45,13 +45,13 @@ module Configurator = struct
33 | s ->
34 (* findlib 1.7.3 installs META file for graphics
35 even when there is no graphics library installed. *)
36- let dest = Caml.Filename.temp_file "test" ".cma" in
37- let res = match Caml.Sys.command & !% "ocamlfind ocamlc -package %s -o %s -linkpkg" n dest with
38+ let dest = Stdlib.Filename.temp_file "test" ".cma" in
39+ let res = match Stdlib.Sys.command & !% "ocamlfind ocamlc -package %s -o %s -linkpkg" n dest with
40 | 0 -> Some s
41 | _ -> None
42 | exception _ -> None
43 in
44- (try Caml.Sys.remove dest with _ -> ());
45+ (try Stdlib.Sys.remove dest with _ -> ());
46 res
47 | exception Findlib.No_such_package _ -> None
48
49@@ -83,14 +83,14 @@ type item =
50 module Make(A : sig val name : string end) = struct
51 let t = create A.name
52
53- let log fmt = Caml.Format.eprintf fmt
54+ let log fmt = Stdlib.Format.eprintf fmt
55
56 module Package_conf = Package_conf
57 open Package_conf
58
59 let extract_package_conf xs =
60- Caml.List.fold_left merge empty
61- (Caml.List.map (fun item -> match item with
62+ Stdlib.List.fold_left merge empty
63+ (Stdlib.List.map (fun item -> match item with
64 | Library (Some pkc) -> pkc
65 | _ -> empty) xs)
66
67@@ -167,8 +167,8 @@ module Make(A : sig val name : string end) = struct
68 let by_cc ~c_flags ~link_flags ~headers ~functions:fnames () =
69 log "Checking library %s by using C compiler... " (String.concat ~sep:" " link_flags);
70 let headers = "stdio.h" :: headers in
71- let includes = Caml.List.map (!% "#include <%s>") headers in
72- let fcalls = Caml.List.map (!% " ( (void(*)()) (%s) )();") fnames in
73+ let includes = Stdlib.List.map (!% "#include <%s>") headers in
74+ let fcalls = Stdlib.List.map (!% " ( (void(*)()) (%s) )();") fnames in
75 let code =
76 String.concat ~sep:"\n"
77 & includes