From d2b5ede0539567568cfb917e08f1b80a3eab38e7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 21 Dec 2017 10:46:24 +0100 Subject: build-system/gnu: Check whether the cross-libc has a "static" output. This is a followup to 614fffe4270cef308573a6d9cef650f3972875af, which broke cross-compilation to i686-w64-mingw32. * guix/build-system/gnu.scm (standard-cross-packages): Add "cross-libc:static" only when LIBC has a "static" output. --- guix/build-system/gnu.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'guix/build-system') diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index ae8274a7f7..c9140074b7 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -415,8 +415,12 @@ is one of `host' or `target'." ("cross-binutils" ,(binutils target)))) ((target) (let ((libc (libc target))) - `(("cross-libc" ,libc) - ("cross-libc:static" ,libc "static")))))))) + `(("cross-libc" ,libc) + + ;; MinGW's libc doesn't have a "static" output. + ,@(if (member "static" (package-outputs libc)) + `(("cross-libc:static" ,libc "static")) + '())))))))) (define* (gnu-cross-build store name #:key -- cgit v1.2.3