[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Ludovic Courtès |
Date: |
Tue, 23 Jan 2018 17:54:23 -0500 (EST) |
branch: master
commit 4306667a491841b69641046cfab92688145a3042
Author: Ludovic Courtès <address@hidden>
Date: Tue Jan 23 23:53:41 2018 +0100
base: Always set 'keep-going' when opening the store.
Previously 'restart-builds' would lack it, for instance.
* src/cuirass/base.scm (process-specs): Move 'set-build-options' call
to...
(with-store): ... here.
---
src/cuirass/base.scm | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/cuirass/base.scm b/src/cuirass/base.scm
index 360b6e6..db2fdde 100644
--- a/src/cuirass/base.scm
+++ b/src/cuirass/base.scm
@@ -66,7 +66,14 @@
;; the store at each context switch. Remove this when the real 'with-store'
;; has been fixed.
(let* ((store (open-connection))
- (result (begin exp ...)))
+ (result (begin
+ ;; Always set #:keep-going? so we don't stop on the first
+ ;; build failure.
+ (set-build-options store
+ #:use-substitutes? (%use-substitutes?)
+ #:fallback? (%fallback?)
+ #:keep-going? #t)
+ exp ...)))
(close-connection store)
result))
@@ -411,12 +418,6 @@ updating DB accordingly."
(unless (assq-ref spec #:no-compile?)
(compile (string-append (%package-cachedir) "/"
(assq-ref spec #:name))))
- ;; Always set #:keep-going? so we don't stop on the first build
- ;; failure.
- (set-build-options store
- #:use-substitutes? (%use-substitutes?)
- #:fallback? (%fallback?)
- #:keep-going? #t)
(spawn-fiber
(lambda ()