02/02: gnu: glibc/hurd-headers: Cross-build fix for the Hurd.

[guix-commits]

janneke pushed a commit to branch master
in repository guix.

commit 1339a03b6d28c0b1726b501bde27a807f960edff
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
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 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index a49ea25..38e8d36 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2014 Alex Kost <address@hidden>
 ;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis <address@hidden>
 ;;; Copyright © 2016, 2017, 2019 Efraim Flashner <address@hidden>
-;;; Copyright © 2016 Jan Nieuwenhuizen <address@hidden>
+;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen <address@hidden>
 ;;; Copyright © 2016, 2018 Alex Vong <address@hidden>
 ;;; Copyright © 2017 Rene Saavedra <address@hidden>
 ;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
@@ -1173,6 +1173,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.