Skip to content

Commit

Permalink
Driver: Fix finding libraries in voodoo mode
Browse files Browse the repository at this point in the history
  • Loading branch information
jonludlam committed Dec 18, 2024
1 parent 6ed033c commit 147a8f1
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/driver/voodoo.ml
Original file line number Diff line number Diff line change
Expand Up @@ -274,17 +274,17 @@ let extra_paths compile_dir =
(fun (pkgs, libs) abs_path ->
let path = Fpath.rem_prefix compile_dir abs_path |> Option.get in
match Fpath.segs path with
| [ "p"; _pkg; _version; libname; l ] when l = lib_marker ->
| [ "p"; _pkg; _version; "doc"; libname; l ] when l = lib_marker ->
Logs.debug (fun m -> m "Found lib marker: %a" Fpath.pp path);
(pkgs, Util.StringMap.add libname (Fpath.parent path) libs)
| [ "p"; pkg; _version; l ] when l = pkg_marker ->
| [ "p"; pkg; _version; "doc"; l ] when l = pkg_marker ->
Logs.debug (fun m -> m "Found pkg marker: %a" Fpath.pp path);
(Util.StringMap.add pkg (Fpath.parent path) pkgs, libs)
| [ "u"; _universe; _pkg; _version; libname; l ] when l = lib_marker
->
| [ "u"; _universe; _pkg; _version; "doc"; libname; l ]
when l = lib_marker ->
Logs.debug (fun m -> m "Found lib marker: %a" Fpath.pp path);
(pkgs, Util.StringMap.add libname (Fpath.parent path) libs)
| [ "u"; _universe; pkg; _version; l ] when l = pkg_marker ->
| [ "u"; _universe; pkg; _version; "doc"; l ] when l = pkg_marker ->
Logs.debug (fun m -> m "Found pkg marker: %a" Fpath.pp path);
(Util.StringMap.add pkg (Fpath.parent path) pkgs, libs)
| _ -> (pkgs, libs))
Expand Down

0 comments on commit 147a8f1

Please sign in to comment.