aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVivien Kraus <vivien@planete-kraus.eu>2022-08-05 09:52:21 +0200
committerLudovic Courtès <ludo@gnu.org>2022-08-05 15:28:03 +0200
commite167044fad6a233196a930d943ad9b687431e8d7 (patch)
treef3a2278e49f6584519dc8dae30d084b4cef63ce9
parent4337e8466e142da60b9ac1f46d985c875e7fbe15 (diff)
downloadguix-e167044fad6a233196a930d943ad9b687431e8d7.tar.gz
guix-e167044fad6a233196a930d943ad9b687431e8d7.zip
gnu: openssl: Keep .dll.a files in main output.
* gnu/packages/tls.scm (openssl) [phase move-static-libraries]: Do not move .dll.a files to the static output when targetting mingw. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--gnu/packages/tls.scm8
1 files changed, 7 insertions, 1 deletions
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 1e527ecce2..4ee75ace3d 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -507,7 +507,13 @@ OpenSSL for TARGET."
(for-each (lambda (file)
(install-file file slib)
(delete-file file))
- (find-files lib "\\.a$")))))
+ (find-files
+ lib
+ #$(if (target-mingw?)
+ '(lambda (filename _)
+ (and (string-suffix? ".a" filename)
+ (not (string-suffix? ".dll.a" filename))))
+ "\\.a$"))))))
(add-after 'install 'move-extra-documentation
(lambda _
;; Move man pages and full HTML documentation to "doc".