From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp0.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 gNrUAr43PGcpGQAAqHPOHw:P1
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 19 Nov 2024 07:01:18 +0000
Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp0.migadu.com with LMTPS
	id gNrUAr43PGcpGQAAqHPOHw
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 19 Nov 2024 08:01:18 +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=dPFJ0Czg;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=nsaRWQKA;
	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=1731999677;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:cc:mime-version:mime-version:
	 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=ky+GJJGJFtznNJRtG6GW2bFtbqqwxbW12vL8Wj11qN8=;
	b=VGUIGLP38W9ORJn2bzoFAm3/Jyb/P/+wcgKGAnZmriydqZDNu4Sgk42yin+RmVOCwCWjH2
	YoPD4Tze9zb0mePg7lQhjcnODh+DszFc/f8s8tr9tnI8z76kp3hQ2oeZt0Nc1jbQHXV2lK
	Lzw5JyD0VTFuWFxppIVv18pDk4IDU16mt0pzeNjYd2vric4BWl4AbOSd6I10IzlffgmPe+
	zLz8nXRKOqI/HqRw2Mo9AJCO3Kk1JvZrSDycai4t0sqxikmzMZ0JhOXtbnGUcp8o4xxR4J
	CMP4QJpEiw/JOsPtRCzTxwumpPBpZC12ekXo6WUc9yMfiUaGE6yLUjgnqif3Zw==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=dPFJ0Czg;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=nsaRWQKA;
	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=1731999677; a=rsa-sha256; cv=none;
	b=EBC1uk32occp+XYM0F2z0Rm9MseZrb2aKUG6UbP7/ZoG/7D9YHdeYKeC51gM6Gv8crFr2Y
	MJ2L3qJOYhFb87Kb82LQK3y7NLvoekbifU9Eity111nPxDuhOEX3u6e1bLEBVm1Z/ddx56
	FY1xYlXB6Yu+BuzC1LyB6FQ/UA/5X2oIbAcFR/0I1z0macVr61DiQKcuSLzmx+plSQy4m7
	n7NpjhINmVEnX0SM0St24L/sv7cA8Bhp8OvZ4+4M7VriPxDh31Ghp3cSDrZOVBbpvpHq8J
	qemmiGrgYWHJnSmy3EPfHi9SSvy7CL/2WbDbT6CREIQUDJt8QXwQKeX0eCpAkA==
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 DC82343B13
	for <larch@yhetil.org>; Tue, 19 Nov 2024 08:01:17 +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 1tDIDW-0000iu-LJ; Tue, 19 Nov 2024 02:00:06 -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 1tDIDU-0000ey-1D
 for guix-patches@gnu.org; Tue, 19 Nov 2024 02:00:04 -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 1tDIDT-0004Wr-Ip; Tue, 19 Nov 2024 02:00:03 -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=ky+GJJGJFtznNJRtG6GW2bFtbqqwxbW12vL8Wj11qN8=; 
 b=dPFJ0Czgpp+4G0xYq7mNl8KJzuilKxKhIWVYB4/UcYbzrL8uYT8KRQuPGQ+gq0AgbCJFA2mhyZhx+rY0klP6tP8m7iCHBt/fq0h9UydHjSDXBnfc07u6sVwmjRJwow7h8B71hRHIpTbZHwQyOw1UYmZkKwnXqXNffS0KLOE1ksqHPF61wB+Hb5TnxOn863CTZNR7AsAK7OhAzMwX4FIyhnNwUs8XegUTzXJgjtINirmAwqdCWln5IUL9stdgeTZ2JM5s6/Iis0dPjuu17WYyvozGTDU06RyE/Pf/4gICAqgf3D53fkwd9FDQOhFuzACuZwMxQ4Nb0vHNuMjSTLwPaw==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tDIDT-0005O8-AR; Tue, 19 Nov 2024 02:00:03 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#74290] [PATCH v3 44/51] gnu: commencement: libstdc++-boot0-gcc7:
 Replace by make-libstdc++-boot0.
Resent-From: Janneke Nieuwenhuizen <janneke@gnu.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: andreas@enge.fr, efraim@flashner.co.il, ekaitz@elenq.tech,
 ludo@gnu.org, guix-patches@gnu.org
Resent-Date: Tue, 19 Nov 2024 07:00:03 +0000
Resent-Message-ID: <handler.74290.B74290.173199958920559@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
Cc: Andreas Enge <andreas@enge.fr>, Efraim Flashner <efraim@flashner.co.il>,
 Ekaitz Zarraga <ekaitz@elenq.tech>,
 Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
X-Debbugs-Original-Xcc: Andreas Enge <andreas@enge.fr>,
 Efraim Flashner <efraim@flashner.co.il>, Ekaitz Zarraga <ekaitz@elenq.tech>,
 Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199958920559
 (code B ref 74290); Tue, 19 Nov 2024 07:00:03 +0000
Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:49 +0000
Received: from localhost ([127.0.0.1]:40653 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tDIDF-0005LR-0e
 for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:49 -0500
Received: from eggs.gnu.org ([209.51.188.92]:52226)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <janneke@gnu.org>) id 1tDICM-0005C1-7M
 for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:54 -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 1tDIAB-00046H-PC; Tue, 19 Nov 2024 01:56:39 -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=ky+GJJGJFtznNJRtG6GW2bFtbqqwxbW12vL8Wj11qN8=; b=nsaRWQKAX7LYHek5/ACi
 kyYXfezIrvm/52OMWgch/isfRjNPYFPAxQqsfCFFLHd1WVZ++muXMAQ91ntB53laQZ/USEoCa/eW1
 j9BpFAM+DeGkE3Gr3Yy7PBBjZE7yGIJQ6DibD0l4VWkSkd+DM2oewbT2w2KxWFpea21TLQOyD5woi
 FoM+uVEO8QICigDkPmfEvVXXylla64FBRgCy74O80+R98SlTr2ZYZo8DC5udaCeXiDMjCOPzhV7WT
 elQBMUeNft080Z857JLJyKs85Jo+P8dSL1gNHjZmFysC1X2bhmwrBGbF5AlB7kbbiHdXk5OgdaJy3
 DsG0LCgYIi6qbQ==;
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 19 Nov 2024 07:55:14 +0100
Message-ID: <e8087f1989bb41fc40962954bae1a4f8038c234e.1731999203.git.janneke@gnu.org>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1731999202.git.janneke@gnu.org>
References: <cover.1731999202.git.janneke@gnu.org>
MIME-Version: 1.0
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: -3.22
X-Spam-Score: -3.22
X-Migadu-Queue-Id: DC82343B13
X-TUID: 2JONmAZaCAfr

* gnu/packages/commencement.scm (libstdc++-boot0-gcc7): Change variable to...
(make-libstdc++-boot0): ...this new procedure and update accordingly.
(gcc-boot0): Update accordingly, and cater for x86_64-gnu.

Change-Id: Ib0bc84e4dab90b080e5a01e6ab932f8be456c656
---
 gnu/packages/commencement.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index ad70bae501..a14de3002f 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2273,9 +2273,9 @@ (define libstdc++-boot0
       (inputs (%boot0-inputs))
       (native-inputs '()))))
 
-(define libstdc++-boot0-gcc7
+(define (make-libstdc++-boot0 gcc)
   ;; GCC >= 7 is needed by architectures which use C++-14 features.
-  (let ((lib (make-libstdc++ gcc-7)))
+  (let ((lib (make-libstdc++ gcc)))
     (package
       (inherit lib)
       (source (bootstrap-origin (package-source lib)))
@@ -2446,7 +2446,8 @@ (define gcc-boot0
 
               ;; The libstdc++ that libcc1 links against.
               ("libstdc++" ,(match (%current-system)
-                                   ("riscv64-linux" libstdc++-boot0-gcc7)
+                                   ("riscv64-linux" (make-libstdc++-boot0 gcc-7))
+                                   ("x86_64-gnu" (make-libstdc++-boot0 gcc-14))
                                    (_ libstdc++-boot0)))
 
               ;; Call it differently so that the builder can check whether
-- 
2.46.0