mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-23 22:23:15 +00:00
34 lines
1.6 KiB
Diff
34 lines
1.6 KiB
Diff
|
diff --git a/serapi/serapi_paths.ml b/serapi/serapi_paths.ml
|
||
|
|
index a9c5074..eed92e3 100644
|
||
|
|
--- a/serapi/serapi_paths.ml
|
||
|
|
+++ b/serapi/serapi_paths.ml
|
||
|
|
@@ -23,10 +23,10 @@
|
||
|
|
let coq_loadpath_default ~implicit ~coq_path =
|
||
|
|
let open Loadpath in
|
||
|
|
let mk_path prefix = coq_path ^ "/" ^ prefix in
|
||
|
|
- let mk_lp ~ml ~root ~dir ~implicit =
|
||
|
|
+ let mk_lp ~ml ~root ~dir ~implicit ~absolute =
|
||
|
|
{ recursive = true;
|
||
|
|
path_spec = VoPath {
|
||
|
|
- unix_path = mk_path dir;
|
||
|
|
+ unix_path = if absolute then dir else mk_path dir;
|
||
|
|
coq_path = root;
|
||
|
|
has_ml = ml;
|
||
|
|
implicit;
|
||
|
|
@@ -35,11 +35,11 @@ let coq_loadpath_default ~implicit ~coq_path =
|
||
|
|
(* in 8.8 we can use Libnames.default_* *)
|
||
|
|
let coq_root = Names.DirPath.make [Libnames.coq_root] in
|
||
|
|
let default_root = Libnames.default_root_prefix in
|
||
|
|
- [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";
|
||
|
|
+ [mk_lp ~ml:AddRecML ~root:coq_root ~implicit ~dir:"plugins" ~absolute:false;
|
||
|
|
+ mk_lp ~ml:AddNoML ~root:coq_root ~implicit ~dir:"theories" ~absolute:false;
|
||
|
|
+ mk_lp ~ml:AddRecML ~root:default_root ~implicit:false ~dir:"user-contrib" ~absolute:false;
|
||
|
|
] @
|
||
|
|
- List.map (fun dir -> mk_lp ~ml:AddRecML ~root:default_root ~implicit:false ~dir)
|
||
|
|
+ List.map (fun dir -> mk_lp ~ml:AddRecML ~root:default_root ~implicit:false ~dir ~absolute:true)
|
||
|
|
Envars.coqpath
|
||
|
|
|
||
|
|
(******************************************************************************)
|