~ruther/guix-local: guix: gnu-build-system: Handle missing libc.

b40a44430f94a9381eb9c8170985bc44e73252f3 — Jean-Pierre De Jesus DIAZ 2 years ago 444a40c

guix: gnu-build-system: Handle missing libc.

* guix/build-system/gnu.scm (standard-cross-packages): Handle the case
  when `cross-libc` returns #f.

Change-Id: I85ee5456f10ff141d521a5f2d91267cd612c5616
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>

patch browse .tar.gz

1 files changed, 5 insertions(+), 2 deletions(-)

M guix/build-system/gnu.scm

M guix/build-system/gnu.scm => guix/build-system/gnu.scm +5 -2

@@ 460,10 460,13 @@ is one of `host' or `target'."
            `(("cross-gcc" ,(gcc target
                                 #:xbinutils (binutils target)
                                 #:libc libc))
-             ("cross-libc" ,libc)
+             ;; Some targets don't have a libc. (e.g. *-elf targets).
+             ,@(if libc
+                   `(("cross-libc" ,libc))
+                   '())
 
              ;; MinGW's libc doesn't have a "static" output.
-             ,@(if (member "static" (package-outputs libc))
+             ,@(if (and libc (member "static" (package-outputs libc)))
                    `(("cross-libc:static" ,libc "static"))
                    '()))))))))