From 8acca614dae94fed321b6cc43d030cd5cb49ec6d Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Wed, 29 Aug 2018 20:20:07 +0300 Subject: [PATCH] Use dedicated compilation context for deprecated modules Signed-off-by: Rudi Grinberg --- src/compilation_context.ml | 9 +++++++-- src/compilation_context.mli | 2 +- src/lib_rules.ml | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/compilation_context.ml b/src/compilation_context.ml index 6b39af76..9f572dc4 100644 --- a/src/compilation_context.ml +++ b/src/compilation_context.ml @@ -106,5 +106,10 @@ let for_alias_module t = ; alias_module = None } -let set_modules t modules = - { t with modules } +let for_deprecated t modules = + { t with + flags = Ocaml_flags.default ~profile:(SC.profile t.super_context) + ; includes = Includes.empty + ; alias_module = None + ; modules + } diff --git a/src/compilation_context.mli b/src/compilation_context.mli index 40cde805..a4bf2dc4 100644 --- a/src/compilation_context.mli +++ b/src/compilation_context.mli @@ -49,4 +49,4 @@ val preprocessing : t -> Preprocessing.t val no_keep_locs : t -> bool val opaque : t -> bool -val set_modules : t -> Module.t Module.Name.Map.t -> t +val for_deprecated : t -> Module.t Module.Name.Map.t -> t diff --git a/src/lib_rules.ml b/src/lib_rules.ml index 6f5abe3f..8f71bd7c 100644 --- a/src/lib_rules.ml +++ b/src/lib_rules.ml @@ -147,7 +147,7 @@ module Gen (P : Install_rules.Params) = struct ); let dep_graphs = Ocamldep.Dep_graphs.deprecated ~modules ~deprecated in - let cctx = Compilation_context.set_modules cctx deprecated in + let cctx = Compilation_context.for_deprecated cctx deprecated in Module_compilation.build_modules cctx ~js_of_ocaml ~dynlink ~dep_graphs let build_c_file (lib : Library.t) ~scope ~dir ~includes (src, dst) =