2 files changed, 12 insertions(+), 9 deletions(-)

M guix/build/gnu-build-system.scm
M guix/build/utils.scm

@@ 236,18 236,11 @@ makefiles."
                   (string-append srcdir "/configure")
                   flags))))
 
-(define %parallel-job-count
-  ;; String to be passed next to GNU Make's `-j' argument.
-  (match (getenv "NIX_BUILD_CORES")
-    (#f "1")
-    ("0" (number->string (current-processor-count)))
-    (x x)))
-
 (define* (build #:key (make-flags '()) (parallel-build? #t)
                 #:allow-other-keys)
   (zero? (apply system* "make"
                 `(,@(if parallel-build?
-                        `("-j" ,%parallel-job-count)
+                        `("-j" ,(number->string (parallel-job-count)))
                         '())
                   ,@make-flags))))
 


@@ 257,7 250,7 @@ makefiles."
   (if tests?
       (zero? (apply system* "make" test-target
                     `(,@(if parallel-tests?
-                            `("-j" ,%parallel-job-count)
+                            `("-j" ,(number->string (parallel-job-count)))
                             '())
                       ,@make-flags)))
       (begin

@@ 31,6 31,8 @@
   #:re-export (alist-cons
                alist-delete)
   #:export (%store-directory
+            parallel-job-count
+
             directory-exists?
             executable-file?
             call-with-ascii-input-file


@@ 69,6 71,14 @@
   (or (getenv "NIX_STORE")
       "/gnu/store"))
 
+(define (parallel-job-count)
+  "Return the number of processes to be passed next to GNU Make's `-j'
+argument."
+  (match (getenv "NIX_BUILD_CORES")               ;set by the daemon
+    (#f  1)
+    ("0" (current-processor-count))
+    (x   (or (string->number x) 1))))
+
 (define (directory-exists? dir)
   "Return #t if DIR exists and is a directory."
   (let ((s (stat dir #f)))