fix conflicts between base and dune

owlbarn · Nov 2, 2018 · 3615105 · 3615105
1 parent d00a66c
commit 3615105
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/owl/config/configure.ml b/src/owl/config/configure.ml
@@ -7,7 +7,7 @@ module C = Configurator.V1
 
 
 let write_sexp fn sexp =
-  Stdio.Out_channel.write_all fn ~data:(Base.Sexp.to_string sexp)
+  Stdio.Out_channel.write_all fn ~data:(Sexplib.Sexp.to_string sexp)
 
 
 let get_os_type c =
@@ -153,7 +153,7 @@ let () =
     (* assemble default config *)
     let conf : C.Pkg_config.package_conf = { cflags; libs } in
 
-    write_sexp "c_flags.sexp" Base.(sexp_of_list sexp_of_string conf.cflags);
-    write_sexp "c_library_flags.sexp" Base.(sexp_of_list sexp_of_string conf.libs);
-    write_sexp "ocaml_flags.sexp" Base.(sexp_of_list sexp_of_string ocaml_flags);
+    write_sexp "c_flags.sexp" Sexplib.Std.(sexp_of_list sexp_of_string conf.cflags);
+    write_sexp "c_library_flags.sexp" Sexplib.Std.(sexp_of_list sexp_of_string conf.libs);
+    write_sexp "ocaml_flags.sexp" Sexplib.Std.(sexp_of_list sexp_of_string ocaml_flags);
   )
diff --git a/src/owl/config/dune b/src/owl/config/dune
@@ -1,7 +1,7 @@
 (executable
  (name configure)
  (libraries
-  base
   dune.configurator
+  sexplib
   stdio
   ))