~ruther/guix-local

58f5c9ad8263ef62aead4af52761d851e54ea8af — Maxim Cournoyer 1 year, 2 months ago b7e02bc
build/guile: Disable parallel build for now.

Following discussions in bug #74204.

* guix/build-system/guile.scm (guile-build): Add a #:parallel-build? flag,
defaulting to #f for now.
(guile-cross-build): Likewise.
* guix/build/guile-build-system.scm (build): Honor it.

Change-Id: Ibf12ac098e9dcea83da7b9685796e501df606c6c
2 files changed, 16 insertions(+), 1 deletions(-)

M guix/build-system/guile.scm
M guix/build/guile-build-system.scm
M guix/build-system/guile.scm => guix/build-system/guile.scm +11 -0
@@ 85,6 85,10 @@
                      (source-directory ".")
                      not-compiled-file-regexp
                      (scheme-file-regexp %scheme-file-regexp)
                      ;; FIXME: Turn on parallel building of Guile modules by
                      ;; default after the non-determinism issues in the Guile byte
                      ;; compiler are resolved (see bug #20272).
                      (parallel-build? #f)
                      (compile-flags %compile-flags)
                      (imported-modules %guile-build-system-modules)
                      (modules '((guix build guile-build-system)


@@ 101,6 105,7 @@
                       #:source-directory #$source-directory
                       #:scheme-file-regexp #$scheme-file-regexp
                       #:not-compiled-file-regexp #$not-compiled-file-regexp
                       #:parallel-build? #$parallel-build?
                       #:compile-flags #$compile-flags
                       #:phases #$phases
                       #:system #$system


@@ 132,6 137,11 @@
                            (source-directory ".")
                            (scheme-file-regexp %scheme-file-regexp)
                            not-compiled-file-regexp
                            ;; FIXME: Turn on parallel building of Guile
                            ;; modules by default after the non-determinism
                            ;; issues in the Guile byte compiler are resolved
                            ;; (see bug #20272).
                            (parallel-build? #f)
                            (compile-flags %compile-flags)
                            (imported-modules %guile-build-system-modules)
                            (modules '((guix build guile-build-system)


@@ 159,6 169,7 @@
                       #:source-directory #$source-directory
                       #:scheme-file-regexp #$scheme-file-regexp
                       #:not-compiled-file-regexp #$not-compiled-file-regexp
                       #:parallel-build? #$parallel-build?
                       #:compile-flags #$compile-flags
                       #:inputs %build-target-inputs
                       #:native-inputs %build-host-inputs

M guix/build/guile-build-system.scm => guix/build/guile-build-system.scm +5 -1
@@ 145,6 145,10 @@ Raise an error if one of the processes exit with non-zero."
(define* (build #:key outputs inputs native-inputs
                (source-directory ".")
                (compile-flags '())
                ;; FIXME: Turn on parallel building of Guile modules by
                ;; default after the non-determinism issues in the Guile byte
                ;; compiler are resolved (see bug #20272).
                (parallel-build? #f)
                (scheme-file-regexp %scheme-file-regexp)
                (not-compiled-file-regexp #f)
                target


@@ 205,7 209,7 @@ installed; this is useful for files that are meant to be included."
                                 (string-append source-directory "/" file)
                                 flags)))
                   source-files)
       #:max-processes (parallel-job-count)
       #:max-processes (if parallel-build? (parallel-job-count) 1)
       #:report-progress report-build-progress))))

(define* (install-documentation #:key outputs