[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: build: Improve Guile 2.2 compatibility.
From: |
Taylan Ulrich Bay?rl?/Kammer |
Subject: |
01/01: build: Improve Guile 2.2 compatibility. |
Date: |
Thu, 29 Sep 2016 21:56:35 +0000 (UTC) |
taylanub pushed a commit to branch master
in repository guix.
commit 5a88b2d1304ad57c1249558a261a8d191daf9758
Author: Taylan Ulrich Bayırlı/Kammer <address@hidden>
Date: Tue Sep 27 22:34:06 2016 +0200
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.
---
build-aux/compile-all.scm | 3 +++
guix/build/pull.scm | 3 +++
2 files changed, 6 insertions(+)
diff --git a/build-aux/compile-all.scm b/build-aux/compile-all.scm
index 7c937a0..46b3817 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 ccf1868..871bf6f 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