-I include dirs when linking cmxs too

pqwy · Nov 23, 2016 · a6b3b8a · a6b3b8a
1 parent 7ab52ef
commit a6b3b8a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/ocb_stubblr.ml b/src/ocb_stubblr.ml
@@ -82,8 +82,10 @@ type ocb_hook = Ocamlbuild_plugin.hook -> unit
 let after_rules f = function After_rules -> f () | _ -> ()
 
 let include_include_dirs = after_rules @@ fun () ->
-  flag ["ocaml"; "link"; "program"] @@ S
-    List.(map (fun dir -> [A "-I"; A dir]) !Options.include_dirs |> concat)
+  let inc = S List.(!Options.include_dirs
+    |> map (fun dir -> [A "-I"; A dir]) |> concat) in
+  flag ["ocaml"; "link"; "program"] inc;
+  flag ["ocaml"; "link"; "extension:cmxs"] inc
 
 let ocaml_libs ?(mllibs = ["."]) =
   after_rules @@ fun () ->

diff --git a/src/ocb_stubblr.mli b/src/ocb_stubblr.mli
@@ -145,8 +145,8 @@ val ocaml_libs : ?mllibs:path list -> ocb_hook
     searched recursively. [mllibs] defaults to [["."]]. *)
 
 val include_include_dirs : ocb_hook
-(** [include_include_dirs] will add [-I dir] when linking OCaml programs for
-    every [dir] marked as [include]. *)
+(** [include_include_dirs] will add [-I dir] when linking OCaml programs and
+    [cmxs] for every [dir] marked as [include]. *)
 
 val ccopt : ?tags:string list -> string -> ocb_hook
 (** [ccopt tags options] adds [-ccopt options] when compiling the C sources