diff options
| author | Janneke Nieuwenhuizen <janneke@gnu.org> | 2024-11-06 12:26:47 +0100 |
|---|---|---|
| committer | Janneke Nieuwenhuizen <janneke@gnu.org> | 2024-12-03 08:33:12 +0100 |
| commit | b8c5057e50370d9f65ef7565afe11666528b341a (patch) | |
| tree | 7b775da689b2f3e24b52d73aebb65938b2295926 /gnu/packages/base.scm | |
| parent | 94dfb68d4378377dfe49d6653e4ed668cecd2783 (diff) | |
gnu: cross-libc: Support cross-building for the 64bit Hurd.
* 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
Diffstat (limited to 'gnu/packages/base.scm')
| -rw-r--r-- | gnu/packages/base.scm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 90c25b54e17..02ef71f20d9 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1079,7 +1079,7 @@ the store.") (string-append locale "/C.UTF-8"))))) ,@(if (target-hurd?) - '((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") @@ -1089,7 +1089,12 @@ the store.") (add-after 'install 'create-machine-symlink (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (cpu "i386") + (cpu ,(match (or (%current-target-system) + (%current-system)) + ((? target-x86-32?) + "i386") + ((? target-x86-64?) + "x86_64"))) (machine (string-append out "/include/mach/machine"))) (unless (file-exists? machine) |