From 9c178480eaff4e9e53388c7b69dfe11a507e4b0a Mon Sep 17 00:00:00 2001
From: Jeremie Dimino <jdimino@janestreet.com>
Date: Tue, 6 Mar 2018 14:50:53 +0000
Subject: [PATCH] Update configurator

---
 src/configurator/configurator.ml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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