diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-04-15 19:26:55 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-15 19:26:55 +0200 |
| commit | bd21acf6c390e4fe87eb6053f0b5185d6ecbcf9f (patch) | |
| tree | 09fe91a8351471e5e7a821cb28521dd9b9d7e357 /build-aux | |
| parent | a4f1a7e2db22cd028fb514846c2791928b8734d3 (diff) | |
| parent | b44e19acd1a0d449427cea0333f02ac98605be1c (diff) | |
| download | guix-bd21acf6c390e4fe87eb6053f0b5185d6ecbcf9f.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/compile-all.scm | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/build-aux/compile-all.scm b/build-aux/compile-all.scm index e9f3e957d9..ad75e33a85 100644 --- a/build-aux/compile-all.scm +++ b/build-aux/compile-all.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> -;;; Copyright © 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2016, 2017, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -79,6 +79,14 @@ to 'make'." (current-processor-count)))) (loop tail))))))))) +(define (parallel-job-count*) + ;; XXX: Work around memory requirements not sustainable on i686 above '-j4' + ;; or so: <https://bugs.gnu.org/40522>. + (let ((count (parallel-job-count))) + (if (string-prefix? "i686" %host-type) + (min count 4) + count))) + (define (% completed total) "Return the completion percentage of COMPLETED over TOTAL as an integer." (inexact->exact (round (* 100. (/ completed total))))) @@ -95,7 +103,7 @@ to 'make'." (lambda () (compile-files srcdir (getcwd) (filter file-needs-compilation? files) - #:workers (parallel-job-count) + #:workers (parallel-job-count*) #:host host #:report-load (lambda (file total completed) (when file |