46/58: gnu: commencement: libstdc++-boot0-gcc7: Replace by make-libstdc++-boot0.

[guix-commits]

janneke pushed a commit to branch hurd-team
in repository guix.

commit 0f6acb8bd7ab8198cea709492c792c16c2d4f895
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Mon Nov 11 09:45:29 2024 +0100

    gnu: commencement: libstdc++-boot0-gcc7: Replace by make-libstdc++-boot0.
    
    * 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 @@ exec " gcc "/bin/" program
       (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 @@ exec " gcc "/bin/" program
 
               ;; 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