puck/zilch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(zilch magic): fix ca build error conditions more

Browse source
This commit is contained in:
puck 2025-05-11 22:21:07 +00:00
parent 11709a3eed
commit f3618358aa
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/src/magic.sld
View file

@ -454,7 +454,7 @@
(condition-variable-broadcast! build-condvar) (condition-variable-broadcast! build-condvar)
(when (error-object? e) (when (error-object? e)
(fprintf (current-error-port) "~S ~A" (thread-name (current-thread)) (error-object-message e))) (fprintf (current-error-port) "~S ~A" (thread-name (current-thread)) (error-object-message e)))
(quit)) (quit #f))
(lambda () (lambda ()
(do-build conn item))) (do-build conn item)))
(builder quit conn)) (builder quit conn))
@ -486,6 +486,8 @@
builder-threads))) builder-threads)))
(for-each (lambda (t) (thread-join! t)) builder-threads) (for-each (lambda (t) (thread-join! t)) builder-threads)
(when (eq? pending-count 'error)
(error "CA build failed"))
root-pend) root-pend)
(define (drv-resolve-ca drv outputs) (define (drv-resolve-ca drv outputs)
(if (drv-is-ca drv) (if (drv-is-ca drv)