ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: make-bootstrap: Slightly clarify 'package-with-relocatable-glibc'.

Browse source 
* 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:
Ludovic Courtès 2019-11-09 22:28:04 +01:00
parent 0c72a719ef
commit 929c365ad0
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/make-bootstrap.scm
View file

@ -125,19 +125,19 @@ (define (package-with-relocatable-glibc p)
"Return a variant of P that uses the libc as defined by "Return a variant of P that uses the libc as defined by
`glibc-for-bootstrap'." `glibc-for-bootstrap'."
(define (cross-bootstrap-libc) (define (cross-bootstrap-libc target)
(let ((target (%current-target-system)))
(glibc-for-bootstrap (glibc-for-bootstrap
;; `cross-libc' already returns a cross libc, so clear ;; `cross-libc' already returns a cross libc, so clear
;; %CURRENT-TARGET-SYSTEM. ;; %CURRENT-TARGET-SYSTEM.
(parameterize ((%current-target-system #f)) (parameterize ((%current-target-system #f))
(cross-libc target))))) (cross-libc target))))
;; Standard inputs with the above libc and corresponding GCC. ;; Standard inputs with the above libc and corresponding GCC.
(define (inputs) (define (inputs)
(if (%current-target-system) ; is this package cross built? (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) (define (native-inputs)
@ -146,7 +146,7 @@ (define (native-inputs)
(xgcc (cross-gcc (xgcc (cross-gcc
target target
#:xbinutils (cross-binutils target) #:xbinutils (cross-binutils target)
#:libc (cross-bootstrap-libc)))) #:libc (cross-bootstrap-libc target))))
`(("cross-gcc" ,(package `(("cross-gcc" ,(package
(inherit xgcc) (inherit xgcc)
(search-paths (search-paths