diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-07-18 15:29:45 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-07-18 15:31:12 +0200 |
| commit | ef03d8dc3724caf59c7ea4a551084ddc601e4597 (patch) | |
| tree | e294beab9463670736d0169e6571d2b4f32ca26e | |
| parent | 2acfe022a740f79b593348cc6362cc4ee8f33bb4 (diff) | |
| download | gnu-guix-ef03d8dc3724caf59c7ea4a551084ddc601e4597.tar gnu-guix-ef03d8dc3724caf59c7ea4a551084ddc601e4597.tar.gz | |
syscalls: Delay resolution of "scm_set_automatic_finalization_enabled".
* guix/build/syscalls.scm (%set-automatic-finalization-enabled?!) [guile-2.2]:
Wrap in 'delay'.
| -rw-r--r-- | guix/build/syscalls.scm | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index 549612fa3c..41208e32a8 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -725,15 +725,19 @@ mounted at FILE." (cond-expand (guile-2.2 (define %set-automatic-finalization-enabled?! - (let ((proc (pointer->procedure int - (dynamic-func - "scm_set_automatic_finalization_enabled" - (dynamic-link)) - (list int)))) + ;; When using a statically-linked Guile, for instance in the initrd, we + ;; cannot resolve this symbol, but most of the time we don't need it + ;; anyway. Thus, delay it. + (let ((proc (delay + (pointer->procedure int + (dynamic-func + "scm_set_automatic_finalization_enabled" + (dynamic-link)) + (list int))))) (lambda (enabled?) "Switch on or off automatic finalization in a separate thread. Turning finalization off shuts down the finalization thread as a side effect." - (->bool (proc (if enabled? 1 0)))))) + (->bool ((force proc) (if enabled? 1 0)))))) (define-syntax-rule (without-automatic-finalization exp) "Turn off automatic finalization within the dynamic extent of EXP." |