amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: cross-libc: Support cross-building for the 64bit Hurd.

Browse source 
* gnu/packages/base.scm (glibc)[arguments]: When building for the Hurd, in
phase "create-machine-symlink", do not assume CPU is i386, also cater for
x86_64.
* gnu/packages/cross-base.scm (cross-libc*)[arguments]: Likewise.

Change-Id: Ib009b7bd301b543b8629382330cca9d963b7a812
This commit is contained in:
Janneke Nieuwenhuizen 2024-11-06 12:26:47 +01:00
parent 94dfb68d43
commit b8c5057e50
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/cross-base.scm
View file

@ -738,7 +738,7 @@ returned."
(delete 'install-utf8-c-locale)
,@(if (target-hurd? target)
'((add-after 'install 'augment-libc.so
`((add-after 'install 'augment-libc.so
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(substitute* (string-append out "/lib/libc.so")
@ -748,7 +748,11 @@ returned."
(add-after 'install 'create-machine-symlink
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(cpu "i386")
(cpu ,(match target
((? target-x86-32?)
"i386")
((? target-x86-64?)
"x86_64")))
(machine (string-append
out "/include/mach/machine")))
(unless (file-exists? machine)