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:
parent
6e7778c413
commit
0119b13c50
|
@ -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)
|
| Some prev -> (var, sprintf "%s%c%s" v path_sep prev)
|
||||||
in
|
in
|
||||||
let vars =
|
let vars =
|
||||||
|
let local_lib_path =
|
||||||
|
(Path.relative
|
||||||
|
(Config.local_install_dir ~context:name)
|
||||||
|
"lib")
|
||||||
|
in
|
||||||
[ extend_var "CAML_LD_LIBRARY_PATH"
|
[ extend_var "CAML_LD_LIBRARY_PATH"
|
||||||
(Path.relative
|
(Path.relative
|
||||||
(Config.local_install_dir ~context:name)
|
(Config.local_install_dir ~context:name)
|
||||||
"lib/stublibs")
|
"lib/stublibs")
|
||||||
; extend_var "OCAMLPATH" ~path_sep:ocamlpath_sep
|
; extend_var "OCAMLPATH" ~path_sep:ocamlpath_sep
|
||||||
(Path.relative
|
local_lib_path
|
||||||
(Config.local_install_dir ~context:name)
|
; extend_var "OCAMLFIND_IGNORE_DUPS_IN" ~path_sep:ocamlpath_sep
|
||||||
"lib")
|
local_lib_path
|
||||||
; extend_var "MANPATH"
|
; extend_var "MANPATH"
|
||||||
(Config.local_install_man_dir ~context:name)
|
(Config.local_install_man_dir ~context:name)
|
||||||
; "DUNE_CONFIGURATOR", (Path.to_string ocamlc)
|
; "DUNE_CONFIGURATOR", (Path.to_string ocamlc)
|
||||||
|
|
Loading…
Reference in New Issue