[PATCH 03/10] gnu: hurd: Pass --build to gnumach-headers when not cross building.

[PATCH 03/10] gnu: hurd: Pass --build to gnumach-headers when not cross building.

[Manolis Ragkousis]

[-- Attachment #1: Type: text/plain, Size: 1 bytes --]



[-- Attachment #2: 0003-gnu-hurd-Pass-build-to-gnumach-headers-when-not-cros.patch --]
[-- Type: text/x-patch, Size: 1344 bytes --]

From a03b2964be16bbcd2a61e915ae10469ade6adff1 Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <manolis837@gmail.com>
Date: Sun, 10 May 2015 20:34:33 +0300
Subject: [PATCH 03/10] gnu: hurd: Pass --build to gnumach-headers when not
 cross building.

* gnu/packages/hurd.scm (gnumach-headers): Adjust accordingly.
---
 gnu/packages/hurd.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 393d3c1..40cbfe3 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -27,6 +27,7 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages pkg-config)
   #:use-module (guix git-download))
 
 (define-public gnumach-headers
@@ -53,9 +54,10 @@
                  %standard-phases))
 
       ;; GNU Mach supports only IA32 currently, so cheat so that we can at
-      ;; least install its headers.
-      #:configure-flags '("--build=i686-pc-gnu")
-
+      ;; least install its headers when not cross-compiling.
+      ,@(if (%current-target-system)
+          '()
+          '(#:configure-flags '("--build=i686-pc-gnu")))
       #:tests? #f))
     (home-page "https://www.gnu.org/software/hurd/microkernel/mach/gnumach.html")
     (synopsis "GNU Mach kernel headers")
-- 
2.4.1

Re: [PATCH 03/10] gnu: hurd: Pass --build to gnumach-headers when not cross building.

[Ludovic Courtès]

Manolis Ragkousis <manolis837@gmail.com> skribis:

> From a03b2964be16bbcd2a61e915ae10469ade6adff1 Mon Sep 17 00:00:00 2001
> From: Manolis Ragkousis <manolis837@gmail.com>
> Date: Sun, 10 May 2015 20:34:33 +0300
> Subject: [PATCH 03/10] gnu: hurd: Pass --build to gnumach-headers when not
>  cross building.
>
> * gnu/packages/hurd.scm (gnumach-headers): Adjust accordingly.

Rather:

  * gnu/packages/hurd.scm (gnumach-headers)[arguments]: Pass
    #:configure-flags only when cross-compiling.

OK with this change.

Ludo’.

Re: [PATCH 03/10] gnu: hurd: Pass --build to gnumach-headers when not cross building.

[Manolis Ragkousis]

Done.

Manolis