diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-04-15 16:09:18 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-04-15 16:09:18 +0200 |
| commit | b4440de133401abc6ce8be6c1c2e720efd9b2ba3 (patch) | |
| tree | 0d235e79790239daafbe26e1054b45672067f149 /build-aux | |
| parent | 141262f266ab702c856f634889d4130ae661e79f (diff) | |
| parent | 33ff35d57095bb1283e9fb40edc24556f9a43682 (diff) | |
| download | patches-b4440de133401abc6ce8be6c1c2e720efd9b2ba3.tar patches-b4440de133401abc6ce8be6c1c2e720efd9b2ba3.tar.gz | |
Merge branch 'version-1.1.0'
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 |