Skip to content

Commit b862d64

Browse files
committed
Error handling hit by topkg
1 parent 7576f34 commit b862d64

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/driver/voodoo.ml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,13 @@ let process_package pkg =
9696
Fpath.Set.add meta_dir acc
9797
| Some x ->
9898
let dir = Fpath.(meta_dir // v x) in
99-
Fpath.Set.add dir acc)) Fpath.Set.empty libs
99+
(* NB. topkg installs a META file that points to a ../topkg-care directory
100+
that is installed by the topkg-care package. We filter that out here,
101+
though I've not thought of a good way to sort out the `topkg-care` package *)
102+
match Bos.OS.Dir.exists dir with
103+
| Ok true ->
104+
Fpath.Set.add dir acc
105+
| _ -> acc)) Fpath.Set.empty libs
100106
in
101107
let libname_of_archive =
102108
List.fold_left (fun acc x ->

0 commit comments

Comments
 (0)