[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#35611] [PATCH 1/2] gnu: cross-base: Allow using non-default glibc.
From: |
Carl Dong |
Subject: |
[bug#35611] [PATCH 1/2] gnu: cross-base: Allow using non-default glibc. |
Date: |
Mon, 06 May 2019 22:21:43 +0000 |
* gnu/packages/cross-base.scm (cross-libc, native-libc, cross-newlib?):
Add xlibc optional argument to specify using a non-default glibc
package.
---
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..51e9e2962a 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
+ (xlibc 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 XLIBC cross-built for TARGET, a GNU triplet. Use XGCC and XBINUTILS
+and the cross tool chain."
+ (if (cross-newlib? target xlibc)
+ (native-libc target xlibc)
+ (let ((libc xlibc))
(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
+ (xlibc glibc))
(if (target-mingw? target)
mingw-w64
- glibc))
+ xlibc))
-(define (cross-newlib? target)
- (not (eq? (native-libc target) glibc)))
+(define* (cross-newlib? target
+ #:optional
+ (xlibc glibc))
+ (not (eq? (native-libc target xlibc) xlibc)))
;;; Concrete cross tool chains are instantiated like this:
--
2.21.0
- [bug#35611] [PATCH 1/2] gnu: cross-base: Allow using non-default glibc.,
Carl Dong <=