ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 21:59:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: Honor make's '-j' flag.

Browse source 
* build-aux/compile-all.scm (parallel-job-count): New procedure.
<top level>: Pass it to 'compile-files' as #:workers.
This commit is contained in:
Ludovic Courtès 2017-10-13 18:21:47 +02:00
parent 2890ad332f
commit 3a9976bfcd
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
build-aux/compile-all.scm
View file

@ -19,6 +19,7 @@
(use-modules (ice-9 match) (use-modules (ice-9 match)
(ice-9 threads) (ice-9 threads)
(srfi srfi-1)
(guix build compile) (guix build compile)
(guix build utils)) (guix build utils))
@ -44,6 +45,39 @@ (define (file-needs-compilation? file)
(or (not (file-exists? go)) (or (not (file-exists? go))
(file-mtime<? go file)))) (file-mtime<? go file))))
(define* (parallel-job-count #:optional (flags (getenv "MAKEFLAGS")))
"Return the number of parallel jobs as determined by FLAGS, the flags passed
to 'make'."
(match flags
(#f (current-processor-count))
(flags
(let ((initial-flags (string-tokenize flags)))
(let loop ((flags initial-flags))
(match flags
(()
;; Note: GNU make prior to version 4.2 would hide "-j" flags from
;; $MAKEFLAGS. Thus, check for a "--jobserver" flag here and
;; assume we're using all cores if specified.
(if (any (lambda (flag)
(string-prefix? "--jobserver" flag))
initial-flags)
(current-processor-count) ;GNU make < 4.2
1)) ;sequential make
(("-j" (= string->number count) _ ...)
(if (integer? count)
count
(current-processor-count)))
((head tail ...)
(if (string-prefix? "-j" head)
(match (string-drop head 2)
(""
(current-processor-count))
((= string->number count)
(if (integer? count)
count
(current-processor-count))))
(loop tail)))))))))
;; Install a SIGINT handler to give unwind handlers in 'compile-file' an ;; Install a SIGINT handler to give unwind handlers in 'compile-file' an
;; opportunity to run upon SIGINT and to remove temporary output files. ;; opportunity to run upon SIGINT and to remove temporary output files.
(sigaction SIGINT (sigaction SIGINT
@ -54,6 +88,7 @@ (define (file-needs-compilation? file)
((_ . files) ((_ . files)
(compile-files srcdir (getcwd) (compile-files srcdir (getcwd)
(filter file-needs-compilation? files) (filter file-needs-compilation? files)
#:workers (parallel-job-count)
#:host host #:host host
#:report-load (lambda (file total completed) #:report-load (lambda (file total completed)
(when file (when file