From patchwork Sun Nov 10 10:38:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70181 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B0F5627BBEA; Sun, 10 Nov 2024 10:40:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 66A6327BBE2 for ; Sun, 10 Nov 2024 10:40:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5Md-00017O-Kj; Sun, 10 Nov 2024 05:40:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tA5Ma-00014q-OE for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:12 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tA5Ma-0008IS-E3 for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=Zz8anSv5Huxep52di4cOhJogr9uUQxbGgmXNpy/VFBI=; b=e+dxAmnxMvBLuLKGSAfInZ10s8meMrMV0ppuP5VumTdj+JR+mH8FA5e3x5g8czFmQGyEwnMNRQAWzRYn+SBPHsGzCd2Yx6AW7ySImtbtU94xY9kEjKS0DklOPwB5TMPlW0XtMRhJG5dmLF5dKnqVM1saE7EoCn8pZSPyZQIOqDi91Bs6QyqHzXqJSqfp+gbukUWC34FTuGFdXuPkUHcJyCswpSBf4o9TieD9/0OnfX5lRIV1y8UJ9FPqjmQRjn64Ifb2i9jgwQzsQ0GlA287sAFhUXoTaTmUQx5tQGshlHe3tIyrnZEcU2rCf1fKD3lduqyGMqxEk4XxUtosmW3HdQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5Ma-0002pb-A7 for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:12 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 31/31] system: hurd: Use 64bit gnumach for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173123518710347 (code B ref 74290); Sun, 10 Nov 2024 10:40:12 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:47 +0000 Received: from localhost ([127.0.0.1]:55815 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5MB-0002gj-2O for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48286) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lp-0002dy-8E for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:25 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tA5Lj-0007wB-Qm; Sun, 10 Nov 2024 05:39:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=Zz8anSv5Huxep52di4cOhJogr9uUQxbGgmXNpy/VFBI=; b=ghLVa98i8SSp9HqmKvnY a09RTheI9oML3pCm7+XTvG9UkP7P07iQREbiJmIBRWD22eJPG9IV05juV8UGTfagb5counsekGWfC +atlR0viyyGBOd8a2zccLRKzUe26IBNODp1e8diFd/NLwenf76tflsIsbgYQrSnO+e54fgvN2ZyP3 sMTXSd3Tx8nWuXPNAi+dojfK2HkYsxSV8EjamDpgmHjNACuTB4T53fdhn/TxJUqQSSz2KSn1vw7e2 pgZOiaTugDrCv37pWjf8xsEVKH4VUFmEKBgZ1Ne87L0XOEWzwyae9rjLZ0pdUDXfbxvSQQstYz3dl 8pkr9stpCgPllw==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:27 +0100 Message-ID: <52f615e031e134f37d20b5bda18e24391c6654c0.1731232753.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/system/hurd.scm (%hurd-default-operating-system-kernel): Use actual (%current-target-system) to specify (%current-system) instead of using hardcoded "i686-linux". Change-Id: Ifc179bce221b1a54461860c24ba400cf6932ec86 --- gnu/system/hurd.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 9a351529e8..58e41959f4 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -18,6 +18,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu system hurd) + #:use-module (ice-9 match) #:use-module (guix gexp) #:use-module (guix profiles) #:use-module (guix utils) @@ -64,9 +65,13 @@ (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))) + (let ((system (match (%current-system) + ((? target-x86-32?) "i686-linux") + ((? target-x86-64?) "x86_64-linux") + (_ "i686-linux")))) + (with-parameters ((%current-system system) + (%current-target-system #f)) + gnumach)))) (define %base-packages/hurd ;; Note: the Shepherd comes before the Hurd, not just because its duty is to