summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Neidhardt <mail@ambrevar.xyz>2020-01-16 17:45:53 +0100
committerPierre Neidhardt <mail@ambrevar.xyz>2020-01-16 17:47:48 +0100
commitaeaa8a02f56d94a74638f99698bdc7a014145c83 (patch)
treec5984083eafa76e4f69be0ad690b7451e758cd59
parent7007b3d0f2d98a78b31abf5f93b8f5d9cec943e9 (diff)
nonguix: Add support for libraries for an extension other than ".so".
* nonguix/build-system/binary.scm (binary-build): Don't fail when setting the interpreter of libraries that don't contain ".so" in their name.
-rw-r--r--nonguix/build/binary-build-system.scm4
1 files changed, 3 insertions, 1 deletions
diff --git a/nonguix/build/binary-build-system.scm b/nonguix/build/binary-build-system.scm
index 30b55e5..984f38c 100644
--- a/nonguix/build/binary-build-system.scm
+++ b/nonguix/build/binary-build-system.scm
@@ -82,7 +82,9 @@ Both executables and dynamic libraries are accepted.
82The inputs are optional when the file is an executable." 82The inputs are optional when the file is an executable."
83 (define (binary-patch binary interpreter runpath) 83 (define (binary-patch binary interpreter runpath)
84 (unless (string-contains binary ".so") 84 (unless (string-contains binary ".so")
85 (invoke "patchelf" "--set-interpreter" interpreter binary)) 85 ;; Use `system*' and not `invoke' since this may raise an error if
86 ;; library does not end with .so.
87 (system* "patchelf" "--set-interpreter" interpreter binary))
86 (when runpath 88 (when runpath
87 (let ((rpath (string-join 89 (let ((rpath (string-join
88 (map 90 (map