diff options
| author | Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> | 2016-09-27 22:34:06 +0200 |
|---|---|---|
| committer | Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> | 2016-09-29 23:59:06 +0200 |
| commit | 5a88b2d1304ad57c1249558a261a8d191daf9758 (patch) | |
| tree | 6a8705bc89d2310683e459050979366abb908392 | |
| parent | cfb7e269e9d91598d884b3d531710d7f22c11a44 (diff) | |
| download | guix-5a88b2d1304ad57c1249558a261a8d191daf9758.tar.gz | |
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.
| -rw-r--r-- | build-aux/compile-all.scm | 3 | ||||
| -rw-r--r-- | guix/build/pull.scm | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/build-aux/compile-all.scm b/build-aux/compile-all.scm index 7c937a0422..46b381723b 100644 --- a/build-aux/compile-all.scm +++ b/build-aux/compile-all.scm @@ -81,6 +81,9 @@ (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))))) diff --git a/guix/build/pull.scm b/guix/build/pull.scm index ccf1868516..871bf6f535 100644 --- a/guix/build/pull.scm +++ b/guix/build/pull.scm @@ -125,6 +125,9 @@ containing the source code. Write any debugging output to DEBUG-PORT." (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 |