From: "Ludovic Courtès" <ludo@gnu.org>
To: 72643@debbugs.gnu.org
Cc: "Ludovic Courtès" <ludo@gnu.org>, "Ludovic Courtès" <ludo@gnu.org>
Subject: [bug#72643] [PATCH core-updates 1/6] gnu: make-bootstrap: Fix cross-compilation of ‘%glibc-stripped’.
Date: Thu, 15 Aug 2024 18:58:29 +0200 [thread overview]
Message-ID: <01749753fe8eb0e5889024310d6ddb12f740637d.1723740352.git.ludo@gnu.org> (raw)
In-Reply-To: <cover.1723740352.git.ludo@gnu.org>
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
---
gnu/packages/make-bootstrap.scm | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index d5b6b818b3..679aa46d60 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -448,19 +448,20 @@ (define (%glibc-stripped)
(make-stripped-libc (assoc-ref %outputs "out")
(assoc-ref %build-inputs "libc")
(assoc-ref %build-inputs "kernel-headers")))))
- (inputs `(("kernel-headers"
- ,(if (or (and (%current-target-system)
- (target-hurd? (%current-target-system)))
- (string-suffix? "-hurd" (%current-system)))
- gnumach-headers
- linux-libre-headers))
- ("libc" ,(let ((target (%current-target-system)))
- (if target
- (glibc-for-bootstrap
- (parameterize ((%current-target-system #f))
- (cross-libc target)))
- glibc)))))
- (native-inputs '())
+ (native-inputs
+ `(("libc" ,(let ((target (%current-target-system)))
+ (if target
+ (glibc-for-bootstrap
+ (parameterize ((%current-target-system #f))
+ (cross-libc target)))
+ glibc)))))
+ (inputs
+ `(("kernel-headers"
+ ,(if (or (and (%current-target-system)
+ (target-hurd? (%current-target-system)))
+ (string-suffix? "-hurd" (%current-system)))
+ gnumach-headers
+ linux-libre-headers))))
(propagated-inputs '())
;; Only one output.
--
2.45.2
next prev parent reply other threads:[~2024-08-15 17:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-15 16:54 [bug#72643] [PATCH core-updates 0/6] Restore i586-gnu (GNU/Hurd) support Ludovic Courtès
2024-08-15 16:58 ` Ludovic Courtès [this message]
2024-08-15 16:58 ` [bug#72643] [PATCH core-updates 2/6] gnu: make-bootstrap: Adjust ‘%glibc-stripped’ for glibc@2.39 on the Hurd Ludovic Courtès
2024-08-15 16:58 ` [bug#72643] [PATCH core-updates 3/6] gnu: make-bootstrap: Include libdl.a and libutil.a in ‘glibc-stripped’ Ludovic Courtès
2024-08-15 16:58 ` [bug#72643] [PATCH core-updates 4/6] DRAFT gnu: glibc-bootstrap: Update i586-gnu variant Ludovic Courtès
2024-08-15 16:58 ` [bug#72643] [PATCH core-updates 5/6] gnu: perl-boot0: Use gexps Ludovic Courtès
2024-08-15 16:58 ` [bug#72643] [PATCH core-updates 6/6] gnu: commencement: Build ‘perl-boot0’ without stack protector on the Hurd Ludovic Courtès
2024-08-16 14:07 ` [bug#72643] [PATCH core-updates 0/6] Restore i586-gnu (GNU/Hurd) support Janneke Nieuwenhuizen
2024-08-16 17:56 ` bug#72643: " Ludovic Courtès
2024-08-18 9:02 ` [bug#72643] " Janneke Nieuwenhuizen
2024-08-20 12:37 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=01749753fe8eb0e5889024310d6ddb12f740637d.1723740352.git.ludo@gnu.org \
--to=ludo@gnu.org \
--cc=72643@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.