gnu: libtool: Use 'parallel-job-count' to get the argument for '-j'.

* gnu/packages/autotools.scm (libtool)[arguments] <check>:
  Use (parallel-job-count) instead of hand-written code.
This commit is contained in:
Ludovic Courtès 2015-01-06 22:58:26 +01:00
parent fa1e2f3d0d
commit 5d65ad80b5

View file

@ -266,17 +266,10 @@ (define-public libtool
'check 'pre-check 'check 'pre-check
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Run the test suite in parallel, if possible. ;; Run the test suite in parallel, if possible.
(let ((ncores (setenv "TESTSUITEFLAGS"
(cond (string-append
((getenv "NIX_BUILD_CORES") "-j"
=> (number->string (parallel-job-count))))
(lambda (n)
(if (zero? (string->number n))
(number->string (current-processor-count))
n)))
(else "1"))))
(setenv "TESTSUITEFLAGS"
(string-append "-j" ncores)))
;; Path references to /bin/sh. ;; Path references to /bin/sh.
(let ((bash (assoc-ref inputs "bash"))) (let ((bash (assoc-ref inputs "bash")))