From 68cf393c5fcae785bda98a01a577c174c314c2d7 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Fri, 16 Mar 2018 01:45:39 +0800 Subject: [PATCH] Use Bin.path_sep --- src/bin.mli | 2 ++ src/context.ml | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/bin.mli b/src/bin.mli index 94fce500..0c927b00 100644 --- a/src/bin.mli +++ b/src/bin.mli @@ -1,5 +1,7 @@ (** OCaml binaries *) +val path_sep : char + (** Contents of [PATH] *) val path : Path.t list diff --git a/src/context.ml b/src/context.ml index 218e52f7..b358f05c 100644 --- a/src/context.ml +++ b/src/context.ml @@ -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"