summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-12-20 14:56:47 +0100
committerLudovic Courtès <ludo@gnu.org>2017-12-20 14:56:47 +0100
commit614fffe4270cef308573a6d9cef650f3972875af (patch)
tree10bfc4c65e8435e1ca6684891f50323003386239
parent1b0f65dc99fc64e572197e36f66a44a597ab3150 (diff)
downloadguix-614fffe4270cef308573a6d9cef650f3972875af.tar.gz
build-system/gnu: Add the "static" output of libc in cross environments.
Fixes a regression whereby the host libc.a would be missing when
cross-compiling.

This is a followup to commit 6dff905e51202bbdebbad8811b6509584d12a796.

* guix/build-system/gnu.scm (standard-cross-packages): Add the
"cross-libc:static".
-rw-r--r--guix/build-system/gnu.scm4
1 files changed, 3 insertions, 1 deletions
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index f54afe167c..ae8274a7f7 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -414,7 +414,9 @@ is one of `host' or `target'."
                               #:libc (libc target)))
            ("cross-binutils" ,(binutils target))))
         ((target)
-         `(("cross-libc" ,(libc target))))))))
+         (let ((libc (libc target)))
+          `(("cross-libc" ,libc)
+            ("cross-libc:static" ,libc "static"))))))))
 
 (define* (gnu-cross-build store name
                           #:key