From 102d307520dee27a40feb1ca5a699763a2f3aefe Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Mon, 6 May 2019 22:21:43 +0000 Subject: gnu: cross-base: Allow using non-default glibc. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- 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 25caacb723..b3b90a6490 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -422,14 +422,15 @@ (define xhurd-core-headers (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 @@ (define* (cross-libc target ,@(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: -- cgit v1.2.3