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:303:e16b::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms13.migadu.com with LMTPS
	id +M3DFp6LM2dLmgAAe85BDQ:P1
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 12 Nov 2024 17:08:46 +0000
Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp2.migadu.com with LMTPS
	id +M3DFp6LM2dLmgAAe85BDQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 12 Nov 2024 18:08:46 +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=eXJPOMn4;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=eXMKpNQj;
	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=1731431326;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc: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=Oc2P0jK5/RRcqMUVYZ2cbyxGKxdzP3XZZrldqFy4ZN4=;
	b=l0DI3jZBQn3x35qhcN9NuU4VwRTKfkHIY6aCk2YxDvR3GxFla3aT2A3FG8F4VgLtFXqTqR
	THL7hiPcfmslCXoU0mp5C0JssZS4cTNuDqcWXNFIYHesRxIpFiWCuwMDo1CazaZ0EBA1ll
	5RAn8oNq1AOu6pPEWWBgBeKiTi1JeBZf7ToG5HE5f+IG6PLfKlO3t5Jw1wtFImT7ePyaSw
	yHz7HqRimImcK8DojEJXkLYuTVAvGi1zw0o48ApGwqCwcg0yG93y3cskUce+xY+8fVbuQx
	0Q/WwwFIsTglLJkERzQ2jWf0VjAYqkl26zAcRGvC7fKhvUNti4G9SDnyhQrGvQ==
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1731431326; a=rsa-sha256; cv=none;
	b=dNf4jfNJOJqjsBIp5lBR0ISzvYy+kNo/3r7aSB7Gm5f40f4xMTlNBhSYQiKbI6exZhX4U0
	vxU1Z6DhCwNao3pBrzPgqkkINDL+LsyEI6BXZTIs+nBzn4lq4NMBa8v/+1+5pG1gfAfQd1
	F3vBrDTRghZteXx0SAcsRK8CAxTEUnRNid9nZe13hkOCAN3yqvxWOC4Hhr+ABsh8t1O90B
	zt+3FWmjUcdOmVGVar0bkOfXl26FLjhe+anM03Dfvy0EQifYBR+pfBkNLM7sObUmWDqbul
	usueno1UxZqeGFeiNZM6xOy2N3bKH/voAAxlrBU3pnIHcLoZ4UhxcAXFrfvrUw==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=eXJPOMn4;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=eXMKpNQj;
	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
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 2A75355E20
	for <larch@yhetil.org>; Tue, 12 Nov 2024 18:08:45 +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 1tAtnH-0004ki-1Q; Tue, 12 Nov 2024 11:31:07 -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 1tAtnD-0004hV-Gw
 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:31:03 -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 1tAtnD-00064a-8Y; Tue, 12 Nov 2024 11:31: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=Oc2P0jK5/RRcqMUVYZ2cbyxGKxdzP3XZZrldqFy4ZN4=; 
 b=eXJPOMn4hjbXcdxHS3PQBoZrQFnLU2VKveAF32F+T7pys0RyI7aD2A8M32gQ7IlRpj6X4JIgcdnLXgAYj5buERwGAZo9VMJneXty9ingYvy9CtyWXfAskEB9AgEkRd7zKejCr5iTKLN+9A92qegdm/wBmaEeLgvUpS64lQwwbVlpnnur9UiWr1ShtnU7M4zEtrP273jfm9hZNBPgaeIzm+73Yv56JcJYMhjPcVx0xOoUptJ5P19Ugni/JZZdDgkmPm56+Lfra2pi03QIy4IpRXro0dBRf+8GOMJKlOUvu6vcvShByciFqlkZ3wpn9yw2EWtk/QTi6yS4FXnrzTe7+g==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tAtnB-0000cz-QE; Tue, 12 Nov 2024 11:31:01 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#74290] [PATCH v2 35/40] 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, 12 Nov 2024 16:31:01 +0000
Resent-Message-ID: <handler.74290.B74290.17314290252241@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.17314290252241
 (code B ref 74290); Tue, 12 Nov 2024 16:31:01 +0000
Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:30:25 +0000
Received: from localhost ([127.0.0.1]:39247 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tAtma-0000Zj-PU
 for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:30:25 -0500
Received: from eggs.gnu.org ([209.51.188.92]:43234)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <janneke@gnu.org>) id 1tAtlv-0000Lb-UY
 for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:44 -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 1tAtjk-0005Rg-Kh; Tue, 12 Nov 2024 11:27:28 -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=Oc2P0jK5/RRcqMUVYZ2cbyxGKxdzP3XZZrldqFy4ZN4=; b=eXMKpNQjGfYVd+FIIMca
 nXWCDllCCcE44EqJNIF2j522xFGsxqGR6vjyxp/EYGDBUDn5pr3tr4ARnMI7e9DaBpD9JdTwWuHZn
 NIVi4nshpykEQvG/WvAd5CmApz/eoVBDL90zfrc23eCgBJZT6bQr31fao9yfG80AQ/grcU/euWpAm
 Jg/OUfxFhN4qVv+eOAHX3Ry/Z2pw/tnuB5LpldQbOWiD/UAamXxHogx4NUxasNrE0jMInrX5TEvgX
 G9J/N94GKpbrYECFbhImh+8Tid6qcC6qqOASw6rR1unRIuSUTeLKDvUAtSRclc6S321+tXiUeErv2
 yN8IX0hbnCg3xQ==;
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 12 Nov 2024 17:25:44 +0100
Message-ID: <185134dc100369ffbf6362e9b8b1fb58ae9f8707.1731427612.git.janneke@gnu.org>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1731427612.git.janneke@gnu.org>
References: <cover.1731427612.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-Flow: FLOW_IN
X-Migadu-Country: US
X-Migadu-Spam-Score: -2.33
X-Spam-Score: -2.33
X-Migadu-Queue-Id: 2A75355E20
X-Migadu-Scanner: mx13.migadu.com
X-TUID: yft0Ny/+gEi0

* 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 aad3f523b5..b2558c0d54 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2274,9 +2274,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)))
@@ -2447,7 +2447,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
-- 
Janneke Nieuwenhuizen <janneke@gnu.org>  | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com | AvatarĀ® https://AvatarAcademy.com