diff --git a/src/module_compilation.ml b/src/module_compilation.ml index f012743fa87..31ce4f3cf08 100644 --- a/src/module_compilation.ml +++ b/src/module_compilation.ml @@ -37,7 +37,7 @@ let build_cm cctx ?sandbox ?(dynlink=true) ~dep_graphs let copy_interface () = (* symlink the .cmi into the public interface directory *) if not (Module.is_private m) - && (Obj_dir.has_public_cmi_dir obj_dir) then + && (Obj_dir.need_dedicated_public_dir obj_dir) then SC.add_rule sctx ~sandbox:false ~dir (Build.symlink ~src:(Module.cm_file_unsafe m Cmi) diff --git a/src/obj_dir.ml b/src/obj_dir.ml index 61777a34c02..8cd2e15e5e0 100644 --- a/src/obj_dir.ml +++ b/src/obj_dir.ml @@ -18,7 +18,7 @@ module External = struct ; private_dir } - let has_public_cmi_dir t = Option.is_some t.private_dir + let need_dedicated_public_dir t = Option.is_some t.private_dir let public_cmi_dir t = t.public_dir @@ -105,7 +105,7 @@ module Local = struct ; public_cmi_dir } - let has_public_cmi_dir t = Option.is_some t.public_cmi_dir + let need_dedicated_public_dir t = Option.is_some t.public_cmi_dir let public_cmi_dir t = Option.value ~default:t.byte_dir t.public_cmi_dir @@ -156,9 +156,9 @@ type t = | External of External.t | Local of Local.t -let has_public_cmi_dir = function - | External e -> External.has_public_cmi_dir e - | Local e -> Local.has_public_cmi_dir e +let need_dedicated_public_dir = function + | External e -> External.need_dedicated_public_dir e + | Local e -> Local.need_dedicated_public_dir e let encode = function | Local obj_dir -> @@ -216,7 +216,7 @@ let pp fmt t = Dyn.pp fmt (to_dyn t) let convert_to_external t ~dir = match t with | Local e -> - let has_private_modules = Local.has_public_cmi_dir e in + let has_private_modules = Local.need_dedicated_public_dir e in External (External.make ~dir ~has_private_modules) | External obj_dir -> Exn.code_error diff --git a/src/obj_dir.mli b/src/obj_dir.mli index 84ee29bb903..9d2f0752d46 100644 --- a/src/obj_dir.mli +++ b/src/obj_dir.mli @@ -19,7 +19,7 @@ val all_cmis: t -> Path.t list (** The public compiled cmi file directory *) val public_cmi_dir: t -> Path.t -val has_public_cmi_dir : t -> bool +val need_dedicated_public_dir : t -> bool val pp: t Fmt.t val to_sexp: t -> Sexp.t diff --git a/src/virtual_rules.ml b/src/virtual_rules.ml index b8aad0d515d..febc88f87bc 100644 --- a/src/virtual_rules.ml +++ b/src/virtual_rules.ml @@ -51,7 +51,7 @@ let setup_copy_rules_for_impl ~sctx ~dir vimpl = let copy_objs src = let dst = Module.set_obj_dir ~obj_dir:impl_obj_dir src in copy_obj_file ~src ~dst Cmi; - if Module.is_public dst && Obj_dir.has_public_cmi_dir impl_obj_dir + if Module.is_public dst && Obj_dir.need_dedicated_public_dir impl_obj_dir then begin let src = Module.cm_public_file_unsafe src Cmi in let dst = Module.cm_public_file_unsafe dst Cmi in