dune top: include directories to find dlls

Signed-off-by: Nicolás Ojeda Bär <[email protected]>
ocaml · Feb 16, 2021 · 5ebe000 · 5ebe000
1 parent 16e64f6
commit 5ebe000
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/bin/top.ml b/bin/top.ml
@@ -48,7 +48,14 @@ let term =
         Dune_rules.Lib.closure ~linking:true libs |> Result.ok_exn
       in
       let include_paths =
-        Dune_rules.Lib.L.include_paths requires Dune_engine.Mode.Byte
+        let requires_with_dlls =
+          List.filter requires ~f:(fun t ->
+              let info = Dune_rules.Lib.info t in
+              Dune_rules.Lib_info.foreign_dll_files info <> [])
+        in
+        Path.Set.union
+          (Dune_rules.Lib.L.include_paths requires Dune_engine.Mode.Byte)
+          (Dune_rules.Lib.L.c_include_paths requires_with_dlls)
       in
       let files = link_deps requires in
       let* () =

diff --git a/src/dune_rules/lib.mli b/src/dune_rules/lib.mli
@@ -74,6 +74,8 @@ module L : sig
 
   val include_flags : ?project:Dune_project.t -> t -> Mode.t -> _ Command.Args.t
 
+  val c_include_paths : t -> Path.Set.t
+
   val c_include_flags : t -> _ Command.Args.t
 
   val compile_and_link_flags :