56/67: gnu: hurd: Support native build on the Hurd.

[guix-commits]

janneke pushed a commit to branch hurd-team
in repository guix.

commit b20359b0b9f37f619e871e0a5583457df5135f60
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Tue Jun 20 17:09:17 2023 +0200

    gnu: hurd: Support native build on the Hurd.
    
    * gnu/packages/hurd.scm (hurd)[arguments]: In phases 'build-libdde-linux' 
and
    'install-goodies', also look in inputs for dependencies.  There is no check
    target, so set #:tests? to #false.
---
 gnu/packages/hurd.scm | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 38b5ae7f0b..2df7b22a24 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -329,7 +329,8 @@ Hurd-minimal package which are needed for both glibc and 
GCC.")
                                        "hurd-rumpdisk-no-hd.patch"))))
     (version (package-version hurd-headers))
     (arguments
-     `(#:phases
+     `(#:tests? #f                      ;no "check" target
+       #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'prepare-addons
            (lambda* (#:key native-inputs inputs #:allow-other-keys)
@@ -468,13 +469,15 @@ exec ${system}/rc \"$@\"
                #t)))
          (add-after 'build 'build-libdde-linux
            (lambda* (#:key inputs native-inputs #:allow-other-keys)
-             (invoke (string-append (assoc-ref native-inputs "make")
+             (invoke (string-append (or (assoc-ref native-inputs "make")
+                                        (assoc-ref inputs "make"))
                                     "/bin/make")
                      ;; XXX There can be a race condition because subdirs
                      ;; aren't interdependent targets in the Makefile.
                      "-j1" "-C" "libdde_linux26"
                      (string-append "SHELL="
-                                    (assoc-ref native-inputs "bash")
+                                    (or (assoc-ref native-inputs "bash")
+                                        (assoc-ref inputs "bash"))
                                     "/bin/bash")
                      (string-append "CC="
                                     ,(cc-for-target)))))
@@ -485,12 +488,14 @@ exec ${system}/rc \"$@\"
              (let* ((out (assoc-ref outputs "out"))
                     (datadir (string-append out "/share/hurd")))
                ;; Install libdde_linux26.
-               (invoke (string-append (assoc-ref native-inputs "make")
+               (invoke (string-append (or (assoc-ref native-inputs "make")
+                                          (assoc-ref inputs "make"))
                                       "/bin/make")
                        "-C" "libdde_linux26" "install"
                        (string-append "SHELL="
-                                    (assoc-ref native-inputs "bash")
-                                    "/bin/bash")
+                                      (or (assoc-ref native-inputs "bash")
+                                          (assoc-ref inputs "bash"))
+                                      "/bin/bash")
                        (string-append "INSTALLDIR="
                                       out
                                       "/share/libdde_linux26/build/include"))