matthieu
/
dune
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Split the building of the .so and .a when needed

This commit is contained in:
Jeremie Dimino 2017-04-05 10:40:21 +01:00 committed by Jérémie Dimino
parent d8f7d77a75
commit cc7ea35a14
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/gen_rules.ml
View File

@ -1458,19 +1458,34 @@ module Gen(P : Params) = struct
match lib.self_build_stubs_archive with match lib.self_build_stubs_archive with
| Some _ -> () | Some _ -> ()
| None -> | None ->
let targets = [ stubs_archive lib ~dir; dll lib ~dir ] in let ocamlmklib ~sandbox ~custom ~targets =
add_rule add_rule ~sandbox
(expand_and_eval_set ~dir lib.c_library_flags ~standard:[] (expand_and_eval_set ~dir lib.c_library_flags ~standard:[]
>>> >>>
Build.run Build.run
~extra_targets:targets ~extra_targets:targets
(Dep ctx.ocamlmklib) (Dep ctx.ocamlmklib)
[ As (g ()) [ As (g ())
; A "-o" ; if custom then A "-custom" else As []
; Path (Path.relative dir (sprintf "%s_stubs" lib.name)) ; A "-o"
; Deps o_files ; Path (Path.relative dir (sprintf "%s_stubs" lib.name))
; Dyn (fun cclibs -> As cclibs) ; Deps o_files
]); ; Dyn (fun cclibs -> As cclibs)
])
in
let static = stubs_archive lib ~dir in
let dynamic = dll lib ~dir in
if List.mem Mode.Native ~set:lib.modes &&
List.mem Mode.Byte ~set:lib.modes then begin
(* If we build for both modes, use a single invocation to build both the static
and dynamic libraries *)
ocamlmklib ~sandbox:false ~custom:false ~targets:[static; dynamic]
end else begin
ocamlmklib ~sandbox:false ~custom:true ~targets:[static];
(* We can't tell ocamlmklib to build only the dll, so we sandbox the action to
avoid overriding the static archive *)
ocamlmklib ~sandbox:true ~custom:false ~targets:[dynamic]
end
end; end;
List.iter Cm_kind.all ~f:(mk_lib_cm_all lib ~dir ~modules); List.iter Cm_kind.all ~f:(mk_lib_cm_all lib ~dir ~modules);