diff options
author | Ludovic Courtès <ludo@gnu.org> | 2022-12-05 15:51:04 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2022-12-05 15:51:04 +0100 |
commit | 7fde16671523f3fc3bda0c07a47a1fa33f8675b1 (patch) | |
tree | eb4de00690836b426870ddf162d8ddd16502cb81 /guix | |
parent | bcbf9713dae06e01d97ff61bc87a9f4d91571bac (diff) | |
parent | 241772d5c068fb7c4fa69d4673174254742eb410 (diff) | |
download | guix-patches-7fde16671523f3fc3bda0c07a47a1fa33f8675b1.tar guix-patches-7fde16671523f3fc3bda0c07a47a1fa33f8675b1.tar.gz |
Merge branch 'version-1.4.0'
Diffstat (limited to 'guix')
-rw-r--r-- | guix/build/syscalls.scm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index 2a12567b15..0358960ff5 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -447,9 +447,14 @@ If an error occurs while creating the binding, defer the error report until the returned procedure is called." (catch #t (lambda () + ;; Note: When #:library is set, try it first and fall back to libc + ;; proper. This is because libraries like libutil.so have been subsumed + ;; by libc.so with glibc >= 2.34. (let ((ptr (dynamic-func name (if library - (dynamic-link library) + (or (false-if-exception + (dynamic-link library)) + (dynamic-link)) (dynamic-link))))) ;; The #:return-errno? facility was introduced in Guile 2.0.12. (pointer->procedure return-type ptr argument-types |