_

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>

src/dune_rules/exe.ml

@@ -364,7 +364,8 @@ let build_and_link_many
   let open Memo.O in
   let* () = Module_compilation.build_all cctx in
   let* () =
-    Memo.when_ (Compilation_context.bin_annot cctx) (Ocaml_index.cctx_rules cctx)
+    Memo.when_ (Compilation_context.bin_annot cctx) (fun () ->
+      Ocaml_index.cctx_rules cctx)
   in
   link_many
     ?link_args

src/dune_rules/lib_rules.ml

@@ -607,7 +607,9 @@ let library_rules
     let+ () = Check_rules.add_obj_dir sctx ~obj_dir mode in
     info
   in
-  let+ () = Memo.when_ (Compilation_context.bin_annot cctx) (Ocaml_index.cctx_rules cctx)
+  let+ () =
+    Memo.when_ (Compilation_context.bin_annot cctx) (fun () ->
+      Ocaml_index.cctx_rules cctx)
   and+ () =
     Memo.when_
       (not (Library.is_virtual lib))

src/dune_rules/merlin/ocaml_index.ml

@@ -13,7 +13,7 @@ let index_path_in_obj_dir obj_dir =
 
 let project_index ~build_dir = Path.Build.relative build_dir "project.ocaml-index"
 
-let cctx_rules cctx () =
+let cctx_rules cctx =
   let open Memo.O in
   (* Indexing is performed by the external binary [ocaml-index] which performs
      full shape reduction to compute the actual definition of all the elements in

src/dune_rules/merlin/ocaml_index.mli

@@ -15,7 +15,7 @@ val project_index : build_dir:Path.Build.t -> Path.Build.t
 (** [cctx_rules cctx] sets the rules needed to generate the indexes for every
     module in the compilation context [cctx] and aggregate them in a
     [cctx.uideps] index covering the whole compilation context. *)
-val cctx_rules : Compilation_context.t -> unit -> unit Memo.t
+val cctx_rules : Compilation_context.t -> unit Memo.t
 
 (** [context_indexes] lists all the available cctx.ocaml-index files in the
     given context *)