diff --git a/src/gen_rules.ml b/src/gen_rules.ml index 336a1a61..c752f55f 100644 --- a/src/gen_rules.ml +++ b/src/gen_rules.ml @@ -780,7 +780,7 @@ module Gen(P : Params) = struct ~preprocessor_deps ~lint:exes.buildable.lint ~js_of_ocaml:exes.buildable.js_of_ocaml - ~has_dot_merlin:exes.buildable.gen_dot_merlin + ~has_dot_merlin:true in { Merlin. diff --git a/src/jbuild.ml b/src/jbuild.ml index c550d771..2de4a414 100644 --- a/src/jbuild.ml +++ b/src/jbuild.ml @@ -464,7 +464,6 @@ module Buildable = struct ; ocamlc_flags : Ordered_set_lang.Unexpanded.t ; ocamlopt_flags : Ordered_set_lang.Unexpanded.t ; js_of_ocaml : Js_of_ocaml.t - ; gen_dot_merlin : bool } let modules_field name = @@ -502,7 +501,6 @@ module Buildable = struct ; ocamlc_flags ; ocamlopt_flags ; js_of_ocaml - ; gen_dot_merlin = true } let single_preprocess t = diff --git a/src/jbuild.mli b/src/jbuild.mli index e421e9e8..a956e87f 100644 --- a/src/jbuild.mli +++ b/src/jbuild.mli @@ -142,9 +142,6 @@ module Buildable : sig ; ocamlc_flags : Ordered_set_lang.Unexpanded.t ; ocamlopt_flags : Ordered_set_lang.Unexpanded.t ; js_of_ocaml : Js_of_ocaml.t - ; (** [true] except for on-demand utops, to avoid generation - [.utop/.merlin] files everywhere. *) - gen_dot_merlin : bool } (** Preprocessing specification used by all modules or [No_preprocessing] *) diff --git a/src/super_context.ml b/src/super_context.ml index a2c1b57b..b9419ddc 100644 --- a/src/super_context.ml +++ b/src/super_context.ml @@ -290,7 +290,7 @@ module Libs = struct ~requires:(Lib.Compile.requires lib) ~libraries ~dep_kind - ~has_dot_merlin:conf.buildable.gen_dot_merlin + ~has_dot_merlin:true let requires t ~loc ~dir ~scope ~dep_kind ~libraries ~preprocess ~has_dot_merlin =