diff mbox series

[bug#62307,core-updates,v2,05/20] gnu: cross-base: Add cross arguments to hurd derivatives.

Message ID 20230328142852.26635-6-ludo@gnu.org
State New
Headers
Series Update Hurd and fix build failures |

Commit Message

Ludovic Courtès March 28, 2023, 2:28 p.m. UTC 
  From: Josselin Poiret <dev@jpoiret.xyz>

* gnu/packages/cross-base.scm (cross-kernel-headers*): Add --build and --host to
xhurd-headers and xhurd-minimal.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/cross-base.scm | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 2a7c4d8011..bda494fd02 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -458,10 +458,17 @@  (define xhurd-headers
       (name (string-append (package-name hurd-headers)
                            "-cross-" target))
 
+      (arguments
+       (substitute-keyword-arguments (package-arguments hurd-headers)
+         ((#:configure-flags flags)
+          `(cons* ,(string-append "--build=" (%current-system))
+                  ,(string-append "--host=" target)
+                  ,flags))))
+
       (native-inputs `(("cross-gcc" ,xgcc)
                        ("cross-binutils" ,xbinutils)
                        ("cross-mig" ,xmig)
-                       ,@(alist-delete "mig"(package-native-inputs hurd-headers))))))
+                       ,@(alist-delete "mig" (package-native-inputs hurd-headers))))))
 
   (define xglibc/hurd-headers
     (package
@@ -506,6 +513,10 @@  (define xhurd-minimal
                         (guix build utils)
                         (srfi srfi-26))
              ,@(package-arguments hurd-minimal))
+         ((#:configure-flags flags)
+          `(cons* ,(string-append "--build=" (%current-system))
+                  ,(string-append "--host=" target)
+                  ,flags))
          ((#:phases phases)
           `(modify-phases ,phases
              (add-before 'configure 'set-cross-headers-path