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

We need the .a to build the .cmxs 

Should fix janestreet/re2#17
This commit is contained in:
Jeremie Dimino 2016-12-19 11:47:17 +00:00
parent 079d64f48c
commit ea888074b0
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/gen_rules.ml
View File

@ -996,15 +996,25 @@ module Gen(P : Params) = struct
Option.iter ctx.ocamlopt ~f:(fun ocamlopt -> Option.iter ctx.ocamlopt ~f:(fun ocamlopt ->
let src = lib_archive lib ~dir ~ext:(Mode.compiled_lib_ext Native) in let src = lib_archive lib ~dir ~ext:(Mode.compiled_lib_ext Native) in
let dst = lib_archive lib ~dir ~ext:".cmxs" in let dst = lib_archive lib ~dir ~ext:".cmxs" in
add_rule let build =
(Build.run Build.run
(Dep ocamlopt) (Dep ocamlopt)
[ Ocaml_flags.get flags Native [ Ocaml_flags.get flags Native
; A "-shared"; A "-linkall" ; A "-shared"; A "-linkall"
; A "-I"; Path dir ; A "-I"; Path dir
; A "-o"; Target dst ; A "-o"; Target dst
; Dep src ; Dep src
]) ]
in
let build =
if Library.has_stubs lib then
Build.path (stubs_archive ~dir lib)
>>>
build
else
build
in
add_rule build
); );
match lib.kind with match lib.kind with