diff mbox series

[bug#78349,hurd-team] Allow for a crossbuilt gnumach.

Message ID OPtCRou--F-9@tutamail.com
State New
Headers
Series [bug#78349,hurd-team] Allow for a crossbuilt gnumach. |

Commit Message

yelninei--- via Guix-patches via May 10, 2025, 8:44 a.m. UTC 
  Hello,

While building a childhurd for core-packages-team I noticed that gnumach is currently build with the i686-linux toolchain rather than the i586-pc-gnu cross toolchain with a comment that a cross-built mach has issues. As I wanted to avoid bootstrapping a second toolchain I tried a to cross-build one and found no issues.

I then tried this is also on master with both i586-pc-gnu and x86_64-pc-gnu and have not noticed something (yet?) that indicates that mach is broken, the system boots and I was able to talk to the guix-daemon.

I marked the target as a [hurd-team] branch in case there is need for some more testing.
diff mbox series

Patch

From 1ca15aadf75a46467038deaecf801018b8aa2a39 Mon Sep 17 00:00:00 2001
Message-ID: <1ca15aadf75a46467038deaecf801018b8aa2a39.1746864636.git.yelninei@tutamail.com>
From: Yelninei <yelninei@tutamail.com>
Date: Fri, 9 May 2025 18:26:54 +0000
Subject: [PATCH 1/2] system: hurd: Use the regular gnumach as default kernel.

* gnu/system/hurd.scm (%hurd-default-operating-system-kernel,
%hurd64-default-operating-system-kernel): Set to gnumach.

Change-Id: I7d5515c95e2994e2f0c4ae3a43afe4e6575a53ed
---
 gnu/system/hurd.scm | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index c9df366f24..1436f7b52c 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -64,20 +64,10 @@  (define-module (gnu system hurd)
 ;;; Code:
 
 (define %hurd-default-operating-system-kernel
-  (if (system-hurd?)
-      gnumach
-      ;; A cross-built GNUmach does not work
-      (with-parameters ((%current-system "i686-linux")
-                        (%current-target-system #f))
-        gnumach)))
+  gnumach)
 
 (define %hurd64-default-operating-system-kernel
-  (if (system-hurd?)
-      gnumach
-      ;; A cross-built GNUmach does not work
-      (with-parameters ((%current-system "x86_64-linux")
-                        (%current-target-system #f))
-        gnumach)))
+  %hurd-default-operating-system-kernel)
 
 (define %base-packages/hurd
   ;; Note: the Shepherd comes before the Hurd, not just because its duty is to

base-commit: 43de5db0af03f118c10cef43dc3966ff8eabec0e
-- 
2.49.0