civodul pushed a commit to branch master
in repository guix.
commit 102d307520dee27a40feb1ca5a699763a2f3aefe
Author: Carl Dong <[email protected]>
Date: Mon May 6 22:21:43 2019 +0000
gnu: cross-base: Allow using non-default glibc.
* gnu/packages/cross-base.scm (cross-libc, native-libc, cross-newlib?):
Add 'libc' optional argument to specify using a non-default glibc
package.
Signed-off-by: Ludovic Courtès <[email protected]>
---
gnu/packages/cross-base.scm | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 25caacb..b3b90a6 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -422,14 +422,15 @@ target that libc."
(define* (cross-libc target
#:optional
+ (libc glibc)
(xgcc (cross-gcc target))
(xbinutils (cross-binutils target))
(xheaders (cross-kernel-headers target)))
- "Return a libc cross-built for TARGET, a GNU triplet. Use XGCC and
-XBINUTILS and the cross tool chain."
- (if (cross-newlib? target)
- (native-libc target)
- (let ((libc glibc))
+ "Return LIBC cross-built for TARGET, a GNU triplet. Use XGCC and XBINUTILS
+and the cross tool chain."
+ (if (cross-newlib? target libc)
+ (native-libc target libc)
+ (let ((libc libc))
(package (inherit libc)
(name (string-append "glibc-cross-" target))
(arguments
@@ -502,13 +503,17 @@ XBINUTILS and the cross tool chain."
,@(package-inputs libc) ;FIXME: static-bash
,@(package-native-inputs libc)))))))
-(define (native-libc target)
+(define* (native-libc target
+ #:optional
+ (libc glibc))
(if (target-mingw? target)
mingw-w64
- glibc))
+ libc))
-(define (cross-newlib? target)
- (not (eq? (native-libc target) glibc)))
+(define* (cross-newlib? target
+ #:optional
+ (libc glibc))
+ (not (eq? (native-libc target libc) libc)))
;;; Concrete cross tool chains are instantiated like this:
