From 0114e3ff0b72273ee329fa623e96529d6fc81a59 Mon Sep 17 00:00:00 2001 From: Jon Ludlam Date: Tue, 26 Nov 2024 13:57:58 +0000 Subject: [PATCH] Driver: Fix finding libraries in voodoo mode --- src/driver/voodoo.ml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/driver/voodoo.ml b/src/driver/voodoo.ml index 515cc3e786..a1c686c92b 100644 --- a/src/driver/voodoo.ml +++ b/src/driver/voodoo.ml @@ -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))