mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-23 21:17:11 -05:00
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.
This commit is contained in:
parent
0c72a719ef
commit
929c365ad0
1 changed files with 9 additions and 9 deletions
|
@ -125,19 +125,19 @@ (define (package-with-relocatable-glibc p)
|
|||
"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 @@ (define (native-inputs)
|
|||
(xgcc (cross-gcc
|
||||
target
|
||||
#:xbinutils (cross-binutils target)
|
||||
#:libc (cross-bootstrap-libc))))
|
||||
#:libc (cross-bootstrap-libc target))))
|
||||
`(("cross-gcc" ,(package
|
||||
(inherit xgcc)
|
||||
(search-paths
|
||||
|
|
Loading…
Reference in a new issue