staging

Author: ncik-roberts

src/frontend/dune

@@ -21,6 +21,7 @@
   -open Merlin_analysis
   -open Merlin_kernel)
  (libraries
+  merlin_extend
   merlin_utils
   merlin_kernel
   ocaml_utils

src/kernel/dune

@@ -4,9 +4,6 @@
 (rule
  (copy# ../ocaml/driver/pparse.mli pparse.mli))
 
-(rule
- (copy# ../runtime/float32.c float32.c))
-
 (library
  (name merlin_kernel)
  (public_name merlin-lib.kernel)
@@ -21,8 +18,7 @@
   -open Merlin_extend)
  (libraries merlin_config os_ipc ocaml_parsing ocaml_preprocess ocaml_typing
             ocaml_utils merlin_extend merlin_specific merlin_utils
-            merlin_dot_protocol merlin_index_format unix str)
- (foreign_stubs (language c) (names float32)))
+            merlin_dot_protocol merlin_index_format unix str))
 
 (rule
  (targets standard_library.ml)

src/ocaml/compression/dune

@@ -7,4 +7,4 @@
    -open Merlin_utils
    (:standard -w -9))
   (modules_without_implementation annot outcometree mode_intf solver_intf value_rec_types)
-  (libraries merlin_utils ocaml_compression ocaml_parsing ocaml_utils))
+  (libraries merlin_utils ocaml_parsing ocaml_utils))