diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-12-18 03:58:23 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-12-18 03:58:23 +0100 |
| commit | 256d5b3598fa2162e9712fc98781d2cb4ceda31e (patch) | |
| tree | 0e7f7051a59aad879561b5c4ee885e24d3c04bc6 /guix/build-system/gnu.scm | |
| parent | 9f6210cc5c114310a38ad1cc0ff5900409a7e7cc (diff) | |
| parent | 1a9f267f51f97b8ca7049aa72763ddd64aad5b62 (diff) | |
Merge branch 'master' into wip-webkitwip-webkit
Diffstat (limited to 'guix/build-system/gnu.scm')
| -rw-r--r-- | guix/build-system/gnu.scm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index c1aa187c42..cdbb547773 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -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")) '())))))))) |