matthieu
/
dune
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use Bin.path_sep

This commit is contained in:
Rudi Grinberg 2018-03-16 01:45:39 +08:00
parent 2634477def
commit 68cf393c5f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin.mli
View File

@ -1,5 +1,7 @@
(** OCaml binaries *)
val path_sep : char
(** Contents of [PATH] *)
val path : Path.t list

3
src/context.ml
View File

@ -254,13 +254,12 @@ let create ~(kind : Kind.t) ~path ~env ~name ~merlin ~targets () =
env
in
let env =
let sep = if Sys.win32 then ';' else ':' in
let cwd = Sys.getcwd () in
let extend_var var v =
let v = Filename.concat cwd (Path.to_string v) in
match Env.get env var with
| 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
let vars =
[ extend_var "CAML_LD_LIBRARY_PATH"