branch hurd-team updated: squash! gnu: Add rumpkernel. -- fix native build

[guix-commits]

This is an automated email from the git hooks/post-receive script.

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

The following commit(s) were added to refs/heads/hurd-team by this push:
     new efba3478e9 squash! gnu: Add rumpkernel.  -- fix native build
efba3478e9 is described below

commit efba3478e9fe64aab49309335c9465d10fbdbc26
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Tue Jun 20 15:25:37 2023 +0200

    squash! gnu: Add rumpkernel.  -- fix native build
---
 gnu/packages/hurd.scm | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 28ebd7f4be..9df33a5775 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -724,25 +724,25 @@ in userland processes thanks to the DDE layer.")
                    patch-files)
                   ;; Somewhere in the build.sh/make process MIG is not being
                   ;; exported, apparently.
-                  (when target
+                  (let* ((prefix (if (not target) "" (string-append target 
"-")))
+                         (mig (string-append prefix "mig")))
                     (substitute* "pci-userspace/src-gnu/Makefile.inc"
                       (("MIG=mig")
-                       (string-append "MIG=" target "-mig")))))))
+                       (string-append "MIG=" mig)))))))
             (add-before 'configure 'setenv
               (lambda* (#:key build target #:allow-other-keys)
                 (define (noisy-setenv name value)
                   (setenv name value)
                   (format (current-error-port) "set ~a=~s\n" name value))
                 (noisy-setenv "HOST_CC" "gcc")
-                (when target
-                  (noisy-setenv "MIG" (string-append target "-mig")))
-                (let ((target (or target build)))
-                  (noisy-setenv "TARGET_AR" (string-append target "-ar"))
-                  (noisy-setenv "TARGET_CC" (string-append target "-gcc"))
-                  (noisy-setenv "TARGET_CXX" (string-append target "-g++"))
-                  (noisy-setenv "TARGET_LD" (string-append target "-ld"))
-                  (noisy-setenv "TARGET_MIG" (string-append target "-mig"))
-                  (noisy-setenv "TARGET_NM" (string-append target "-nm")))
+                (let* ((prefix (if (not target) "" (string-append target 
"-"))))
+                  (noisy-setenv "TARGET_AR" (string-append prefix "ar"))
+                  (noisy-setenv "TARGET_CC" (string-append prefix "gcc"))
+                  (noisy-setenv "TARGET_CXX" (string-append prefix "g++"))
+                  (noisy-setenv "TARGET_LD" (string-append prefix "ld"))
+                  (noisy-setenv "TARGET_MIG" (string-append prefix "mig"))
+                  (noisy-setenv "TARGET_NM" (string-append prefix "nm"))
+                  (noisy-setenv "MIG" (string-append prefix "mig")))
                 (setenv "PAWD" "pwd")
                 (for-each
                  (cute noisy-setenv <> "")