[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/06: build: Honor make's '-j' flag.
From: |
Ludovic Courtès |
Subject: |
03/06: build: Honor make's '-j' flag. |
Date: |
Mon, 23 Oct 2017 01:09:11 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 3a9976bfcd13e6554a2458ce1a3b9d7b95043195
Author: Ludovic Courtès <address@hidden>
Date: Fri Oct 13 18:21:47 2017 +0200
build: Honor make's '-j' flag.
* build-aux/compile-all.scm (parallel-job-count): New procedure.
<top level>: Pass it to 'compile-files' as #:workers.
---
build-aux/compile-all.scm | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/build-aux/compile-all.scm b/build-aux/compile-all.scm
index 2fc3102..c7ca5a6 100644
--- a/build-aux/compile-all.scm
+++ b/build-aux/compile-all.scm
@@ -19,6 +19,7 @@
(use-modules (ice-9 match)
(ice-9 threads)
+ (srfi srfi-1)
(guix build compile)
(guix build utils))
@@ -44,6 +45,39 @@
(or (not (file-exists? go))
(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
;; opportunity to run upon SIGINT and to remove temporary output files.
(sigaction SIGINT
@@ -54,6 +88,7 @@
((_ . files)
(compile-files srcdir (getcwd)
(filter file-needs-compilation? files)
+ #:workers (parallel-job-count)
#:host host
#:report-load (lambda (file total completed)
(when file
- branch master updated (2f05dd6 -> d298c81), Ludovic Courtès, 2017/10/23
- 04/06: discovery: Move 'file-name->module-name' to (guix modules)., Ludovic Courtès, 2017/10/23
- 03/06: build: Honor make's '-j' flag.,
Ludovic Courtès <=
- 05/06: gexp: Add 'file-union'., Ludovic Courtès, 2017/10/23
- 01/06: services: base: Add file->udev-rule function., Ludovic Courtès, 2017/10/23
- 06/06: gexp: Add 'directory-union'., Ludovic Courtès, 2017/10/23
- 02/06: build: Factorize module compilation in (guix build compile)., Ludovic Courtès, 2017/10/23