build: Improve Guile 2.2 compatibility.

* build-aux/compile-all.scm (compile-file*): Ensure loading of
  compilation related modules before going parallel.
* guix/build/pull.scm (build-guix): Ditto.
This commit is contained in:
Taylan Ulrich Bayırlı/Kammer 2016-09-27 22:34:06 +02:00
parent cfb7e269e9
commit 5a88b2d130
No known key found for this signature in database
GPG key ID: A1F4CFCC52836BAC
2 changed files with 6 additions and 0 deletions

View file

@ -81,6 +81,9 @@ (define (compile-file* file output-mutex)
(let ((files (filter file-needs-compilation? files)))
(for-each load-module-file files)
(let ((mutex (make-mutex)))
;; Make sure compilation related modules are loaded before starting to
;; compile files in parallel.
(compile #f)
(par-for-each (lambda (file)
(compile-file* file mutex))
files)))))

View file

@ -125,6 +125,9 @@ (define* (build-guix out source
(newline)
(let ((mutex (make-mutex))
(completed 0))
;; Make sure compilation related modules are loaded before starting to
;; compile files in parallel.
(compile #f)
(par-for-each
(lambda (file)
(with-mutex mutex