refactor(boot): pass arch and ccomp_type

This way, we know which parts of the config these functions use.

Signed-off-by: Rudi Grinberg <[email protected]>

<!-- ps-id: 7057bf1d-3b73-4d11-84be-1d8448ba2a2d -->

Author: rgrinberg

boot/duneboot.ml

@@ -1082,7 +1082,8 @@ module Library = struct
         ; root_module
         }
         ~ext_obj
-        ~ocaml_config
+        ~ccomp_type
+        ~architecture
     =
     let scan_subdirs =
       match include_subdirs with
@@ -1161,8 +1162,6 @@ module Library = struct
         | None -> files
         | Some fn -> fn :: files
       in
-      let ccomp_type = String.Map.find "ccomp_type" ocaml_config in
-      let architecture = String.Map.find "architecture" ocaml_config in
       List.partition_map_skip files ~f:(fun (src, fn) ->
         match src.kind with
         | C c ->
@@ -1307,7 +1306,12 @@ let get_dependencies libraries =
   deps
 ;;
 
-let assemble_libraries { local_libraries; target = _, main; _ } ~ext_obj ~ocaml_config =
+let assemble_libraries
+      { local_libraries; target = _, main; _ }
+      ~ext_obj
+      ~ccomp_type
+      ~architecture
+  =
   (* In order to assemble all the sources in one place, the executables
        modules are also put in a namespace *)
   local_libraries
@@ -1316,7 +1320,7 @@ let assemble_libraries { local_libraries; target = _, main; _ } ~ext_obj ~ocaml_
        in
        { Libs.main with main_module_name = Some namespace })
     ]
-  |> Fiber.parallel_map ~f:(Library.process ~ext_obj ~ocaml_config)
+  |> Fiber.parallel_map ~f:(Library.process ~ext_obj ~ccomp_type ~architecture)
 ;;
 
 type status =
@@ -1528,7 +1532,9 @@ let main () =
     try String.Map.find "ext_obj" ocaml_config with
     | Not_found -> ".o"
   in
-  let* libraries = assemble_libraries ~ext_obj ~ocaml_config task in
+  let ccomp_type = String.Map.find "ccomp_type" ocaml_config in
+  let architecture = String.Map.find "architecture" ocaml_config in
+  let* libraries = assemble_libraries task ~ext_obj ~ccomp_type ~architecture in
   let c_files = List.concat_map ~f:(fun (lib : Library.t) -> lib.c_files) libraries in
   let asm_files = List.concat_map ~f:(fun (lib : Library.t) -> lib.asm_files) libraries in
   let* dependencies = get_dependencies libraries in