Use Bin.path_sep
This commit is contained in:
parent
2634477def
commit
68cf393c5f
|
@ -1,5 +1,7 @@
|
||||||
(** OCaml binaries *)
|
(** OCaml binaries *)
|
||||||
|
|
||||||
|
val path_sep : char
|
||||||
|
|
||||||
(** Contents of [PATH] *)
|
(** Contents of [PATH] *)
|
||||||
val path : Path.t list
|
val path : Path.t list
|
||||||
|
|
||||||
|
|
|
@ -254,13 +254,12 @@ let create ~(kind : Kind.t) ~path ~env ~name ~merlin ~targets () =
|
||||||
env
|
env
|
||||||
in
|
in
|
||||||
let env =
|
let env =
|
||||||
let sep = if Sys.win32 then ';' else ':' in
|
|
||||||
let cwd = Sys.getcwd () in
|
let cwd = Sys.getcwd () in
|
||||||
let extend_var var v =
|
let extend_var var v =
|
||||||
let v = Filename.concat cwd (Path.to_string v) in
|
let v = Filename.concat cwd (Path.to_string v) in
|
||||||
match Env.get env var with
|
match Env.get env var with
|
||||||
| None -> (var, v)
|
| None -> (var, v)
|
||||||
| Some prev -> (var, sprintf "%s%c%s" v sep prev)
|
| Some prev -> (var, sprintf "%s%c%s" v Bin.path_sep prev)
|
||||||
in
|
in
|
||||||
let vars =
|
let vars =
|
||||||
[ extend_var "CAML_LD_LIBRARY_PATH"
|
[ extend_var "CAML_LD_LIBRARY_PATH"
|
||||||
|
|
Loading…
Reference in New Issue