01/03: gnu: cross-libc: Build fix for the Hurd.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit b3bd47569637702652c2e7da0ddee8e879b52d71
Author: Jan Nieuwenhuizen <address@hidden>
AuthorDate: Mon Mar 9 14:38:18 2020 +0100

    gnu: cross-libc: Build fix for the Hurd.
    
    This fixes cross building of coreutils, e.g.
    
        ./pre-inst-env guix build --target=i586-pc-gnu coreutils
    
    * gnu/packages/cross-base.scm (cross-libc): Add -lhurduser, -lmachuser for 
the
    Hurd.
---
 gnu/packages/cross-base.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 13237fb..ab866ee 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -491,7 +491,17 @@ and the cross tool chain."
                                  ',%gcc-cross-include-paths)
                        (setenv "CROSS_LIBRARY_PATH"
                                (string-append kernel "/lib")) ; for Hurd's 
libihash
-                       #t)))))))
+                       #t)))
+                 ,@(if (hurd-triplet? target)
+                       '((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")
+                                 (("/[^ ]+/lib/libc.so.0.3")
+                                  (string-append out "/lib/libc.so.0.3"
+                                                 " libmachuser.so 
libhurduser.so"))))
+                             #t)))
+                       '())))))
 
           ;; Shadow the native "kernel-headers" because glibc's recipe expects 
the
           ;; "kernel-headers" input to point to the right thing.