CatalaLang/catala
1
1
Fork 0
mirror of https://github.com/CatalaLang/catala.git synced 2024-11-09 22:16:10 +03:00
Code Issues Projects Releases Wiki Activity

Clerk: fix OCaml linking options to allow inlining

Browse Source 
Fixes occurences of `Warning 58 [no-cmx-file]: no cmx file was found in path for
module` during builds.
This commit is contained in:
Louis Gesbert 2024-04-23 12:23:31 +02:00
parent 090faf8c9f
commit 1412e76938
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
build_system/clerk_driver.ml
View File

@ -357,11 +357,11 @@ module Poll = struct
running from the root of a compiled source tree.@]" running from the root of a compiled source tree.@]"
d) d)
let ocaml_link_flags : string list Lazy.t = let ocaml_include_and_lib_flags : (string list * string list) Lazy.t =
lazy lazy
(let link_libs = ["zarith"; "dates_calc"] in (let link_libs = ["zarith"; "dates_calc"] in
let link_libs_flags = let includes_libs =
List.concat_map List.map
(fun lib -> (fun lib ->
match File.(check_directory (Lazy.force ocaml_libdir / lib)) with match File.(check_directory (Lazy.force ocaml_libdir / lib)) with
| None -> | None ->
@ -372,15 +372,19 @@ module Poll = struct
File.(Lazy.force ocaml_libdir / lib) File.(Lazy.force ocaml_libdir / lib)
lib lib
| Some d -> | Some d ->
[ ( ["-I"; d],
"-I"; String.map (function '-' -> '_' | c -> c) lib ^ ".cmxa" ))
d;
String.map (function '-' -> '_' | c -> c) lib ^ ".cmxa";
])
link_libs link_libs
in in
let runtime_dir = Lazy.force ocaml_runtime_dir in let includes, libs = List.split includes_libs in
link_libs_flags @ [File.(runtime_dir / "runtime_ocaml.cmxa")]) ( List.concat includes @ ["-I"; Lazy.force ocaml_runtime_dir],
libs @ [File.(Lazy.force ocaml_runtime_dir / "runtime_ocaml.cmxa")] ))
let ocaml_include_flags : string list Lazy.t =
lazy (fst (Lazy.force ocaml_include_and_lib_flags))
let ocaml_link_flags : string list Lazy.t =
lazy (snd (Lazy.force ocaml_include_and_lib_flags))
let has_command cmd = let has_command cmd =
let check_cmd = Printf.sprintf "type %s >/dev/null 2>&1" cmd in let check_cmd = Printf.sprintf "type %s >/dev/null 2>&1" cmd in
@ -471,7 +475,7 @@ let base_bindings catala_exe catala_flags build_dir include_dirs test_flags =
| _ -> false) | _ -> false)
test_flags test_flags
in in
let ocaml_flags = ["-I"; Lazy.force Poll.ocaml_runtime_dir] in let ocaml_flags = Lazy.force Poll.ocaml_include_flags in
[ [
Nj.binding Var.ninja_required_version ["1.7"]; Nj.binding Var.ninja_required_version ["1.7"];
(* use of implicit outputs *) (* use of implicit outputs *)
@ -528,7 +532,7 @@ let[@ocamlformat "disable"] static_base_rules =
Nj.rule "ocaml-exec" Nj.rule "ocaml-exec"
~command: [ ~command: [
!ocamlopt_exe; !runtime_ocaml_libs; !ocaml_flags; !ocamlopt_exe; !ocaml_flags; !runtime_ocaml_libs;
shellout [!catala_exe; "depends"; shellout [!catala_exe; "depends";
"--prefix="^ !builddir; "--extension=cmx"; "--prefix="^ !builddir; "--extension=cmx";
!catala_flags; !orig_src]; !catala_flags; !orig_src];