[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/10: gnu: make-bootstrap: Slightly clarify 'package-with-relocatable-g
From: |
guix-commits |
Subject: |
06/10: gnu: make-bootstrap: Slightly clarify 'package-with-relocatable-glibc'. |
Date: |
Sat, 9 Nov 2019 17:06:45 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 929c365ad02a50a6b612866d7700e01e62e3fdd6
Author: Ludovic Courtès <address@hidden>
Date: Sat Nov 9 22:28:04 2019 +0100
gnu: make-bootstrap: Slightly clarify 'package-with-relocatable-glibc'.
* gnu/packages/make-bootstrap.scm (package-with-relocatable-glibc)
[cross-bootstrap-libc]: Take an explicit 'target' argument. Remove
redundant 'parameterize' form.
[inputs, native-inputs]: Adjust accordingly.
---
gnu/packages/make-bootstrap.scm | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 4e6be32..b8d1b2a 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -125,19 +125,19 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
"Return a variant of P that uses the libc as defined by
`glibc-for-bootstrap'."
- (define (cross-bootstrap-libc)
- (let ((target (%current-target-system)))
- (glibc-for-bootstrap
- ;; `cross-libc' already returns a cross libc, so clear
- ;; %CURRENT-TARGET-SYSTEM.
- (parameterize ((%current-target-system #f))
- (cross-libc target)))))
+ (define (cross-bootstrap-libc target)
+ (glibc-for-bootstrap
+ ;; `cross-libc' already returns a cross libc, so clear
+ ;; %CURRENT-TARGET-SYSTEM.
+ (parameterize ((%current-target-system #f))
+ (cross-libc target))))
;; Standard inputs with the above libc and corresponding GCC.
(define (inputs)
(if (%current-target-system) ; is this package cross built?
- `(("cross-libc" ,(cross-bootstrap-libc)))
+ `(("cross-libc"
+ ,(cross-bootstrap-libc (%current-target-system))))
'()))
(define (native-inputs)
@@ -146,7 +146,7 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
(xgcc (cross-gcc
target
#:xbinutils (cross-binutils target)
- #:libc (cross-bootstrap-libc))))
+ #:libc (cross-bootstrap-libc target))))
`(("cross-gcc" ,(package
(inherit xgcc)
(search-paths
- branch master updated (bbfdaaa -> c2cda7d), guix-commits, 2019/11/09
- 01/10: services: hpcguix-web: Explicitly import (guix build utils)., guix-commits, 2019/11/09
- 03/10: tests: Update references to the now-deprecated 'guile-json' variable., guix-commits, 2019/11/09
- 04/10: services: 'fold-services' memoizes service values., guix-commits, 2019/11/09
- 02/10: services: hpcguix-web: Delete lock files during activation., guix-commits, 2019/11/09
- 07/10: doc: Mention value /var to localstatedir option., guix-commits, 2019/11/09
- 05/10: gnu: make-bootstrap: Memoize GCC variant., guix-commits, 2019/11/09
- 08/10: gnu: Add matcha-theme., guix-commits, 2019/11/09
- 06/10: gnu: make-bootstrap: Slightly clarify 'package-with-relocatable-glibc'.,
guix-commits <=
- 10/10: gnu: youtube-dl: Update to 2019.11.05., guix-commits, 2019/11/09
- 09/10: gnu: Add artyfx, guix-commits, 2019/11/09