fix(boot): fix env vars when finding out concurrency

We were passing an empty enviornment to Unix.open_process_full_cmd before. We now pass the full available UNix.environment since we are only querying the concurrency by calling nproc or getconf. On NixOS this was causing the bootstrap to default to a single processor since nproc wasn't available in the empty environment. Signed-off-by: Ali Caglayan <[email protected]>
ocaml · Mar 11, 2023 · 2af6b80 · 2af6b80
1 parent 82df8da
commit 2af6b80
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,9 @@
 Unreleased
 ----------
 
+- Fix the detection of the number of processors in a clean enviornment when
+  bootstrapping (#7272, @Alizter)
+
 - Speed up file copying on macos by using `clonefile` when available
   (@rgrinberg, #7210)
 

diff --git a/boot/duneboot.ml b/boot/duneboot.ml
@@ -195,7 +195,7 @@ let exe = if Sys.win32 then ".exe" else ""
 
 let concurrency =
   let try_run_and_capture_line cmd =
-    let ic, oc, ec = Unix.open_process_full cmd [||] in
+    let ic, oc, ec = Unix.open_process_full cmd (Unix.environment ()) in
     let line =
       match input_line ic with
       | s -> Some s