646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
diff --git a/serapi/serapi_paths.ml b/serapi/serapi_paths.ml
|
|
index b71fa60..0bec8c2 100644
|
|
--- a/serapi/serapi_paths.ml
|
|
+++ b/serapi/serapi_paths.ml
|
|
@@ -24,8 +24,8 @@ let coq_loadpath_default ~implicit ~coq_path =
|
|
let open Loadpath in
|
|
let mk_path prefix = coq_path ^ "/" ^ prefix in
|
|
(* let mk_ml = () in *)
|
|
- let mk_vo ~has_ml ~coq_path ~dir ~implicit =
|
|
- { unix_path = mk_path dir
|
|
+ let mk_vo ~has_ml ~coq_path ~dir ~implicit ~absolute =
|
|
+ { unix_path = if absolute then dir else mk_path dir
|
|
; coq_path
|
|
; has_ml
|
|
; recursive = true
|
|
@@ -40,10 +40,10 @@ let coq_loadpath_default ~implicit ~coq_path =
|
|
List.map fst plugins_dirs
|
|
in
|
|
ml_paths ,
|
|
- [ mk_vo ~has_ml:false ~coq_path:coq_root ~implicit ~dir:"theories"
|
|
- ; mk_vo ~has_ml:true ~coq_path:default_root ~implicit:false ~dir:"user-contrib";
|
|
+ [ mk_vo ~has_ml:false ~coq_path:coq_root ~implicit ~dir:"theories" ~absolute:false
|
|
+ ; mk_vo ~has_ml:true ~coq_path:default_root ~implicit:false ~dir:"user-contrib" ~absolute:false;
|
|
] @
|
|
- List.map (fun dir -> mk_vo ~has_ml:true ~coq_path:default_root ~implicit:false ~dir)
|
|
+ List.map (fun dir -> mk_vo ~has_ml:true ~coq_path:default_root ~implicit:false ~dir ~absolute:true)
|
|
Envars.coqpath
|
|
|
|
(******************************************************************************)
|