Use Dyn

Signed-off-by: Etienne Millon <[email protected]>
ocaml · Feb 6, 2023 · 77cfb9e · 77cfb9e
1 parent 97f9def
commit 77cfb9e
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/dune_rules/ctypes/ctypes_rules.ml b/src/dune_rules/ctypes/ctypes_rules.ml
@@ -218,10 +218,13 @@ let build_c_program ~foreign_archives_deps ~sctx ~dir ~source_files ~scope
   in
   let action =
     if version >= (0, 3) then
+      let of_action_builder l : _ Command.Args.t =
+        Dyn (Action_builder.map l ~f:(fun l -> Command.Args.As l))
+      in
       let args : _ Command.Args.t list =
-        [ Expand (fun ~dir:_ -> with_user_and_std_flags)
-        ; Expand (fun ~dir:_ -> cflags)
-        ; Expand (fun ~dir:_ -> Resolve.Memo.read include_args)
+        [ of_action_builder with_user_and_std_flags
+        ; of_action_builder cflags
+        ; of_action_builder (Resolve.Memo.read include_args)
         ; Deps
             (List.map
                ~f:(fun s -> Path.relative (Path.build dir) s)