nixpkgs/pkgs/development/tools/analysis/frama-c/dynamic.diff
2017-07-18 20:30:53 +02:00

12 lines
617 B
Diff

--- a/src/kernel_services/plugin_entry_points/dynamic.ml 2016-05-30 16:15:22.000000000 +0200
+++ b/src/kernel_services/plugin_entry_points/dynamic.ml 2016-10-13 18:25:31.000000000 +0200
@@ -270,7 +270,8 @@
load_path :=
List.fold_right (add_dir ~user:true) path
(List.fold_right (add_dir ~user:false) Config.plugin_dir []);
- let findlib_path = String.concat ":" !load_path in
+ let findlib_path = String.concat ":" (!load_path @
+ try [Sys.getenv "OCAMLPATH"] with Not_found -> []) in
Klog.debug ~dkey "setting findlib path to %s" findlib_path;
Findlib.init ~env_ocamlpath:findlib_path ()