Skip to content

Commit c451345

Browse files
committed
Make file_deps and file_deps_with_exts share code
Signed-off-by: Rudi Grinberg <[email protected]>
1 parent 0638a77 commit c451345

File tree

1 file changed

+10
-14
lines changed

1 file changed

+10
-14
lines changed

src/super_context.ml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -706,23 +706,19 @@ module Libs = struct
706706
(lib_files_alias ~dir ~name:(Library.best_name lib) ~ext))
707707
|> Path.Set.of_list)
708708

709+
let file_deps_of_lib t (lib : Lib.t) ~ext =
710+
if Lib.is_local lib then
711+
Alias.stamp_file
712+
(lib_files_alias ~dir:(Lib.src_dir lib) ~name:(Lib.name lib) ~ext)
713+
else
714+
Build_system.stamp_file_for_files_of t.build_system
715+
~dir:(Lib.obj_dir lib) ~ext
716+
709717
let file_deps_with_exts t lib_exts =
710-
List.rev_map lib_exts ~f:(fun ((lib : Lib.t), ext) ->
711-
if Lib.is_local lib then
712-
Alias.stamp_file
713-
(lib_files_alias ~dir:(Lib.src_dir lib) ~name:(Lib.name lib) ~ext)
714-
else
715-
Build_system.stamp_file_for_files_of t.build_system
716-
~dir:(Lib.obj_dir lib) ~ext)
718+
List.rev_map lib_exts ~f:(fun (lib, ext) -> file_deps_of_lib t lib ~ext)
717719

718720
let file_deps t libs ~ext =
719-
List.rev_map libs ~f:(fun (lib : Lib.t) ->
720-
if Lib.is_local lib then
721-
Alias.stamp_file
722-
(lib_files_alias ~dir:(Lib.src_dir lib) ~name:(Lib.name lib) ~ext)
723-
else
724-
Build_system.stamp_file_for_files_of t.build_system
725-
~dir:(Lib.obj_dir lib) ~ext)
721+
List.rev_map libs ~f:(file_deps_of_lib t ~ext)
726722
end
727723

728724
module Deps = struct

0 commit comments

Comments
 (0)