diff options
| author | Vivien Kraus <vivien@planete-kraus.eu> | 2023-01-05 00:04:27 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-01-19 17:54:49 +0100 |
| commit | b9d676e0ee7b52ef4bb202507ccc94b5cab590b2 (patch) | |
| tree | c3301e7be9c3a31fb5e95b18ffe58db8df518bd2 | |
| parent | 88854b1a4e364263b0d3c0d1e87de1ce7da51d34 (diff) | |
| download | guix-b9d676e0ee7b52ef4bb202507ccc94b5cab590b2.tar guix-b9d676e0ee7b52ef4bb202507ccc94b5cab590b2.tar.gz | |
gnu: nettle: Fix mingw cross-compilation.
* gnu/packages/nettle.scm (nettle-2) [move-static-libraries]: .dll.a files are
not static libraries.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| -rw-r--r-- | gnu/packages/nettle.scm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gnu/packages/nettle.scm b/gnu/packages/nettle.scm index 27bd9efc60..ea26ba3b2d 100644 --- a/gnu/packages/nettle.scm +++ b/gnu/packages/nettle.scm @@ -44,7 +44,7 @@ (arguments ;; 'sexp-conv' and other programs need to have their RUNPATH point to ;; $libdir, which is not the case by default. Work around it. - '(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" + `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) #:phases (modify-phases %standard-phases @@ -59,7 +59,13 @@ (rename-file ar (string-append slib "/" (basename ar)))) - (find-files "." "\\.a$"))) + (find-files + "." + ,(if (target-mingw?) + '(lambda (filename _) + (and (string-suffix? ".a" filename) + (not (string-suffix? ".dll.a" filename)))) + "\\.a$")))) #t)))))) (outputs '("out" "debug" "static")) (native-inputs (list m4)) |