From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org> Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id GO4dLJaNMGeqeAEAe85BDQ:P1 (envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>) for <larch@yhetil.org>; Sun, 10 Nov 2024 10:40:22 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id GO4dLJaNMGeqeAEAe85BDQ (envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>) for <larch@yhetil.org>; Sun, 10 Nov 2024 11:40:22 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=e+dxAmnx; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=ghLVa98i; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1731235222; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Zz8anSv5Huxep52di4cOhJogr9uUQxbGgmXNpy/VFBI=; b=QuqBATZbgofVkelPZskLM7QgAxQEflBNY2URSDoF6qk1qGS7kjoLvFpSmBQpC1jVHRqDW7 htZM0ltKSizdatwkDqo7LlwWW9XC1seRXqpizV1QQedLDVPNhXSaqaip6RX3OsASmrXzr/ kqhk2/0MFcN+zaSCfCx2paXnjkzravSD063JmRRTQtsF/bm/A1dMmYch/R33pTitOQmTtW 28gXwwgKs2hroTl1PYLjRkBkaGrp/XMuAs3JYRorNOuine+a1TWAyOElPL3GHihPP+tFC4 9BaNg7DB8qtR2eXPq1r68YZpT3bC7eBFblPPxdWeG9ivT+dD+saNoRuN5ge01g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=e+dxAmnx; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=ghLVa98i; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1731235222; a=rsa-sha256; cv=none; b=SsNjOIAvNUeeV23SogxEFn3MDbURLlrr/L5N/4FC6JVBzSy5fjIs8L5noqUWtOuZ8SFB8H 4+kt0+PAh03c+hagxYSg5ZzdPHm7XRIFkfglMo++Kn7hZ7OqVPR+5dnsEzrBd1nHGfcfTn jo80mdpzqYyoln171HjJi497Mghs84ZrXPY0Tut4Rlwc7U8O1lr2MyLrIvbHLK17Gjm4bk lq2pwiK1ASOin45reTs4DgLmz5XdYZnXMtRGrxfDpRk8V0YMct12lcAPKslTW+vLLNlgz7 DgCp5DkcCAsjheBCYzQ+4HGEbnS9x9xGqBDWfmv5+K4fhxSorjGszLE0hyHGGw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8BBA27BE32 for <larch@yhetil.org>; Sun, 10 Nov 2024 11:40:22 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) 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 <Debian-debbugs@debbugs.gnu.org>) 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 <Debian-debbugs@debbugs.gnu.org>) 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 <Debian-debbugs@debbugs.gnu.org>) 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 <janneke@gnu.org> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40:12 +0000 Resent-Message-ID: <handler.74290.B74290.173123518710347@debbugs.gnu.org> 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 <debbugs-submit-bounces@debbugs.gnu.org>) 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 <janneke@gnu.org>) 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 <janneke@gnu.org>) 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 <janneke@gnu.org> 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: <cover.1731232753.git.janneke@gnu.org> References: <cover.1731232753.git.janneke@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: 0.88 X-Spam-Score: 0.88 X-Migadu-Queue-Id: 8BBA27BE32 X-TUID: GfttMZyRL/Px * 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 <http://www.gnu.org/licenses/>. (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 -- Janneke Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | AvatarĀ® https://AvatarAcademy.com