Compute keep_flags from within for_alias_module

Signed-off-by: Etienne Millon <me@emillon.org>
ocaml · Mar 13, 2023 · 0944281 · 0944281
1 parent 5618780
commit 0944281
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/dune_rules/compilation_context.ml b/src/dune_rules/compilation_context.ml
@@ -208,7 +208,8 @@ let create ~super_context ~scope ~expander ~obj_dir ~modules ~flags
   ; loc
   }
 
-let for_alias_module t ?(keep_flags = false) alias_module =
+let for_alias_module t alias_module =
+  let keep_flags = Modules.is_stdlib_alias (modules t) alias_module in
   let flags =
     if keep_flags then t.flags
     else

diff --git a/src/dune_rules/compilation_context.mli b/src/dune_rules/compilation_context.mli
@@ -43,7 +43,7 @@ val create :
   -> t Memo.t
 
 (** Return a compilation context suitable for compiling the alias module. *)
-val for_alias_module : t -> ?keep_flags:bool -> Module.t -> t
+val for_alias_module : t -> Module.t -> t
 
 val super_context : t -> Super_context.t
 

diff --git a/src/dune_rules/module_compilation.ml b/src/dune_rules/module_compilation.ml
@@ -486,7 +486,7 @@ let build_all cctx =
             if Modules.is_stdlib_alias modules m then
               (* XXX it would probably be simpler if the flags were just for this
                  module in the definition of the stanza *)
-              Compilation_context.for_alias_module cctx m ~keep_flags:true
+              Compilation_context.for_alias_module cctx m
             else cctx
           in
           build_module cctx m))