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

Extends the environment with the variable OCAMLFIND_IGNORE_DUPS_IN 

Prevent ocamlfind to warn about multiple definition if the
       library is also installed

Signed-off-by: François Bobot <francois.bobot@cea.fr>
This commit is contained in:
François Bobot 2018-08-21 16:03:10 +02:00 committed by Jérémie Dimino
parent 6e7778c413
commit 0119b13c50
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/context.ml
View File

@ -302,14 +302,19 @@ let create ~(kind : Kind.t) ~path ~env ~env_nodes ~name ~merlin ~targets
| Some prev -> (var, sprintf "%s%c%s" v path_sep prev)
in
let vars =
let local_lib_path =
(Path.relative
(Config.local_install_dir ~context:name)
"lib")
in
[ extend_var "CAML_LD_LIBRARY_PATH"
(Path.relative
(Config.local_install_dir ~context:name)
"lib/stublibs")
; extend_var "OCAMLPATH" ~path_sep:ocamlpath_sep
(Path.relative
(Config.local_install_dir ~context:name)
"lib")
local_lib_path
; extend_var "OCAMLFIND_IGNORE_DUPS_IN" ~path_sep:ocamlpath_sep
local_lib_path
; extend_var "MANPATH"
(Config.local_install_man_dir ~context:name)
; "DUNE_CONFIGURATOR", (Path.to_string ocamlc)