nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build-aux/compile-all.scm
View File

@ -81,6 +81,9 @@
(let ((files (filter file-needs-compilation? files))) (let ((files (filter file-needs-compilation? files)))
(for-each load-module-file files) (for-each load-module-file files)
(let ((mutex (make-mutex))) (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) (par-for-each (lambda (file)
(compile-file* file mutex)) (compile-file* file mutex))
files))))) files)))))

3
guix/build/pull.scm
View File

@ -125,6 +125,9 @@ containing the source code. Write any debugging output to DEBUG-PORT."
(newline) (newline)
(let ((mutex (make-mutex)) (let ((mutex (make-mutex))
(completed 0)) (completed 0))
;; Make sure compilation related modules are loaded before starting to
;; compile files in parallel.
(compile #f)
(par-for-each (par-for-each
(lambda (file) (lambda (file)
(with-mutex mutex (with-mutex mutex