From 6994f4c89d983f4b1d1188bd1570c6cc56c38a92 Mon Sep 17 00:00:00 2001 From: Janneke Nieuwenhuizen Date: Fri, 19 Jan 2024 13:22:02 +0100 Subject: gnu: glibc/hurd: Install include/mach/machine symlink. * gnu/packages/base.scm (glibc): When building for the Hurd, add phase `create-machine-symlink'. * gnu/packages/cross-base.scm (cross-libc*): Likewise. Change-Id: I61fa081ce081f05bed918a438fd9d4eec94ef4bf --- gnu/packages/cross-base.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu/packages/cross-base.scm') diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 7fa9772cb9..b1c34db7d2 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -725,12 +725,18 @@ (define cross-binutils ,@(if (target-hurd? target) '((add-after 'install 'augment-libc.so (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) + (let ((out (assoc-ref outputs "out"))) (substitute* (string-append out "/lib/libc.so") (("/[^ ]+/lib/libc.so.0.3") (string-append out "/lib/libc.so.0.3" - " libmachuser.so libhurduser.so")))) - #t))) + " libmachuser.so libhurduser.so")))))) + (add-after 'install 'create-machine-symlink + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (cpu "i386")) + (symlink cpu + (string-append out + "/include/mach/machine")))))) '()))))) ;; Shadow the native "kernel-headers" because glibc's recipe expects the -- cgit v1.2.3