>From 56c07fb4c8685e7705dccb4ac1814cb8a9c06451 Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <address@hidden>
Date: Tue, 7 Jun 2016 15:01:22 +0300
Subject: [PATCH] gnu: gnumach-headers: Use "--build=i586-pc-gnu" only when not
 cross-building.

* gnu/packages/hurd.scm (gnumach-headers)[arguments]: Use "--build=i586-pc-gnu"
  only when not cross-building.
---
 gnu/packages/hurd.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 72e4061..a858194 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -55,7 +55,11 @@
 
       ;; GNU Mach supports only IA32 currently, so cheat so that we can at
       ;; least install its headers.
-      #:configure-flags '("--build=i686-pc-gnu")
+      ,@(if (%current-target-system)
+            '()
+            ;; See <http://lists.gnu.org/archive/html/bug-hurd/2015-06/msg00042.html>
+            ;; <http://lists.gnu.org/archive/html/guix-devel/2015-06/msg00716.html>
+            '(#:configure-flags '("--build=i586-pc-gnu")))
 
       #:tests? #f))
     (home-page "https://www.gnu.org/software/hurd/microkernel/mach/gnumach.html")
-- 
2.8.2