From 1ded621dc710a46be78b662f0ae33a5db8d687da Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Thu, 30 Aug 2018 14:36:03 +0300 Subject: [PATCH] Install c/cxx stubs for virtual libraries Signed-off-by: Rudi Grinberg --- src/install_rules.ml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/install_rules.ml b/src/install_rules.ml index 12448aaa..c832d925 100644 --- a/src/install_rules.ml +++ b/src/install_rules.ml @@ -164,8 +164,13 @@ module Gen(P : Params) = struct | Some f -> Some f.path) ]) ; if_ (byte && not virtual_library) [ Library.archive ~dir lib ~ext:".cma" ] - ; if_ (Library.has_stubs lib && not virtual_library) + ; if virtual_library then ( + (lib.c_names @ lib.cxx_names) + |> List.map ~f:(fun (_, c) -> Path.relative dir (c ^ ext_obj)) + ) else if Library.has_stubs lib then ( [ Library.stubs_archive ~dir lib ~ext_lib:ctx.ext_lib ] + ) else + [] ; if_ (native && not virtual_library) (let files = [ Library.archive ~dir lib ~ext:".cmxa"