diff --git a/boot/duneboot.ml b/boot/duneboot.ml index 212b66577d3..b5159ecb50f 100644 --- a/boot/duneboot.ml +++ b/boot/duneboot.ml @@ -1141,27 +1141,6 @@ let build ]) ;; -let build_with_single_command - ~ocaml_config:_ - ~dependencies - ~c_files - ~link_flags - { target = name, main; external_libraries; _ } - = - let external_libraries, external_includes = resolve_externals external_libraries in - write_args "mods_list" (sort_files dependencies ~main); - Process.run - ~cwd:build_dir - Config.compiler - (List.concat - [ common_build_args name ~external_includes ~external_libraries - ; [ "-no-alias-deps"; "-w"; "-49-6" ] - ; c_files - ; [ "-args"; "mods_list" ] @ link_flags - ; allow_unstable_sources - ]) -;; - let rec rm_rf fn = match Unix.lstat fn with | { st_kind = S_DIR; _ } -> @@ -1193,7 +1172,6 @@ let main () = | None -> [] | Some flags -> flags) in - let build = if concurrency = 1 || Sys.win32 then build_with_single_command else build in build ~ocaml_config ~dependencies ~c_files ~link_flags task ;; diff --git a/doc/changes/9735-single-command-boot.md b/doc/changes/9735-single-command-boot.md new file mode 100644 index 00000000000..d6b4c3de3a7 --- /dev/null +++ b/doc/changes/9735-single-command-boot.md @@ -0,0 +1,4 @@ +- boot: remove single-command bootstrap. This was an alternative bootstrap + strategy that was used in certain conditions. Removal makes the bootstrap a + bit slower on Linux when only a single core is available, but bootstrap is + now reproducible in all cases. (#9735, fixes #9507, @emillon)