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

commit 0cb52e9c98b59f2e4e3d708bc0b4b3b7a308acb5
Author: Jan (janneke) Nieuwenhuizen <[email protected]>
AuthorDate: Thu Apr 30 00:00:24 2020 +0200

    gnu: glibc/hurd-headers: Cross-build fix for the Hurd.
    
    * gnu/packages/base.scm (glibc/hurd-headers)[native-inputs]: Add mig; when
    cross-building use 32-bit mig.
---
 gnu/packages/base.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 9899067..5ea129a 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1274,6 +1274,15 @@ command.")
     (outputs '("out"))
     (propagated-inputs `(("gnumach-headers" ,gnumach-headers)
                          ("hurd-headers" ,hurd-headers)))
+    (native-inputs
+     `(("mig" ,(if (%current-target-system)
+                   ;; XXX: When targeting i586-pc-gnu, we need a 32-bit MiG,
+                   ;; hence this hack.
+                   (package
+                     (inherit mig)
+                     (arguments `(#:system "i686-linux")))
+                   mig))
+       ,@(package-native-inputs glibc)))
     (arguments
      (substitute-keyword-arguments (package-arguments glibc)
        ;; We just pass the flags really needed to build the headers.

Reply via email to