When executing in the target, use the host's PATH variable

This commit is contained in:
Rudi Grinberg 2018-03-22 22:44:21 +08:00
parent 9f3eb956d3
commit 8859a644e9
1 changed files with 9 additions and 2 deletions

View File

@ -300,13 +300,20 @@ let create ~(kind : Kind.t) ~path ~env ~name ~merlin ~targets () =
(Path.relative
(Config.local_install_dir ~context:name)
"lib")
; extend_var "PATH"
(Config.local_install_bin_dir ~context:name)
; extend_var "MANPATH"
(Config.local_install_man_dir ~context:name)
]
in
Env.extend env ~vars:(Env.Map.of_list_exn vars)
|> Env.update ~var:"PATH" ~f:(fun _ ->
match host with
| None ->
let _key, path =
extend_var "PATH" (Config.local_install_bin_dir ~context:name) in
Some path
| Some host ->
Env.get host.env "PATH"
)
in
let stdlib_dir = Path.of_string (Ocaml_config.standard_library ocfg) in
let natdynlink_supported = Ocaml_config.natdynlink_supported ocfg in