ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-12 22:26:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: make-bootstrap: Fix cross-compilation of ‘%glibc-stripped’.

Browse source 
Previously, ‘guix build bootstrap-tarballs --target=aarch64-linux-gnu’
or similar would construct a cross-libc where ‘%current-target-system’
is set.  This would lead to a failure in the
‘add-cross-binutils-to-PATH’ phase, which assumes that
‘%current-target-system’ is #f; indeed, ‘cross-libc’ already returns a
cross libc and so ‘%current-target-system’ must be set to #f.

* gnu/packages/make-bootstrap.scm (%glibc-stripped)[inputs]: Move libc to…
[native-inputs]: … here.

Change-Id: Ifbf5e519ba3198940f4de4a36075d5302e923172
This commit is contained in:
Ludovic Courtès 2024-08-14 17:51:48 +02:00
parent cfd67d36b5
commit e8a1b10c27
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -448,19 +448,20 @@ (define (%glibc-stripped)
(make-stripped-libc (assoc-ref %outputs "out") (make-stripped-libc (assoc-ref %outputs "out")
(assoc-ref %build-inputs "libc") (assoc-ref %build-inputs "libc")
(assoc-ref %build-inputs "kernel-headers"))))) (assoc-ref %build-inputs "kernel-headers")))))
(inputs `(("kernel-headers" (native-inputs
,(if (or (and (%current-target-system) `(("libc" ,(let ((target (%current-target-system)))
(target-hurd? (%current-target-system))) (if target
(string-suffix? "-hurd" (%current-system))) (glibc-for-bootstrap
gnumach-headers (parameterize ((%current-target-system #f))
linux-libre-headers)) (cross-libc target)))
("libc" ,(let ((target (%current-target-system))) glibc)))))
(if target (inputs
(glibc-for-bootstrap `(("kernel-headers"
(parameterize ((%current-target-system #f)) ,(if (or (and (%current-target-system)
(cross-libc target))) (target-hurd? (%current-target-system)))
glibc))))) (string-suffix? "-hurd" (%current-system)))
(native-inputs '()) gnumach-headers
linux-libre-headers))))
(propagated-inputs '()) (propagated-inputs '())
;; Only one output. ;; Only one output.