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

Update configurator

This commit is contained in:
Jeremie Dimino 2018-03-06 14:50:53 +00:00 committed by Jérémie Dimino
parent 256c3d9969
commit 9c178480ea
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/configurator/configurator.ml
View File

@ -205,10 +205,12 @@ let create ?dest_dir ?ocamlc ?(log=ignore) name =
run_capture_exn t ~dir:dest_dir ocamlc_config_cmd run_capture_exn t ~dir:dest_dir ocamlc_config_cmd
|> String.split_lines |> String.split_lines
in in
Jbuilder.Ocamlc_config.make match Ocamlc_config.of_lines ocamlc_config_output with
~ocamlc:(Jbuilder.Path.of_string ocamlc) | oc -> Ocamlc_config.bindings oc
~ocamlc_config_output:ocamlc_config_output | exception (Ocamlc_config.E msg) ->
|> Jbuilder.Ocamlc_config.bindings die "Failed to parse the output of '%s':@\n\
%s"
ocamlc_config_cmd msg
in in
let get = get_ocaml_config_var_exn ocamlc_config ~ocamlc_config_cmd in let get = get_ocaml_config_var_exn ocamlc_config ~ocamlc_config_cmd in
let c_compiler = let c_compiler =