Merge pull request #224 from ejgallego/v8.11+coqpath

[serapi] Fix #221 "Support COQPATH"
rocq-archive · Aug 26, 2020 · 4723859 · 4723859
2 parents 750dd3e + 5922346
commit 4723859
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -24,6 +24,7 @@
  * [general] SerAPI is now tested with OCaml 4.08 and 4.09 (#195 , @ejgallego)
  * [sertop ] Forward port sername from 0.7.1 (@ejgallego)
  * [serlib ] Fix #212 "Segfault on universes" (@ejgallego, reported by @cpitclaudel , #214)
+ * [serapi ] Fix #221 "Support COQPATH" (@ejgallego, reported by @cpitclaudel , #224)
  * [sertop ] Fix #222 "Support --indices-matter" (@ejgallego, reported by @cpitclaudel , #223)
 
 ## Version 0.11.0:

diff --git a/serapi/serapi_paths.ml b/serapi/serapi_paths.ml
@@ -38,7 +38,9 @@ let coq_loadpath_default ~implicit ~coq_path =
   [mk_lp ~ml:AddRecML ~root:coq_root     ~implicit       ~dir:"plugins";
    mk_lp ~ml:AddNoML  ~root:coq_root     ~implicit       ~dir:"theories";
    mk_lp ~ml:AddRecML ~root:default_root ~implicit:false ~dir:"user-contrib";
-  ]
+  ] @
+  List.map (fun dir -> mk_lp ~ml:AddRecML ~root:default_root ~implicit:false ~dir)
+    Envars.coqpath
 
 (******************************************************************************)
 (* Generate a module name given a file                                        *)