02/06: gnu: bootstrap: %bootstrap-gcc: Also wrap g++.

[guix-commits]

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

commit 1fad575326d6bdb8304723501b72dea90241c1e8
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Tue Nov 19 20:20:50 2024 +0100

    gnu: bootstrap: %bootstrap-gcc: Also wrap g++.
    
    * gnu/packages/bootstrap.scm (%bootstrap-gcc)[arguments]: Have the #:builder
    also wrap g++.
    
    Change-Id: I896baedd2076988fd7769f617078901e3549ba26
---
 gnu/packages/bootstrap.scm | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 6ab7c5d844..9d37f9bc22 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -874,21 +874,22 @@ $out/bin/guile --version~%"
                (invoke tar "xvf"
                        (string-append builddir "/binaries.tar")))
 
-             (with-directory-excursion bindir
-               (chmod "." #o755)
-               (rename-file "gcc" ".gcc-wrapped")
-               (call-with-output-file "gcc"
-                 (lambda (p)
-                   (format p "#!~a
-exec ~a/bin/.gcc-wrapped -B~a/lib \
+             (define (wrap-compiler compiler)
+               (let ((wrapped (format #f ".~a-wrapped" compiler)))
+                 (rename-file compiler wrapped)
+                 (call-with-output-file compiler
+                   (lambda (p)
+                     (format p "#!~a
+exec ~a/bin/~a -B~a/lib \
      -Wl,-rpath -Wl,~a/lib \
      -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
-                           bash
-                           out libc libc libc
-                           ,(glibc-dynamic-linker))))
-
-               (chmod "gcc" #o555)
-               #t))))))
+                             bash
+                             out wrapped libc libc libc
+                             ,(glibc-dynamic-linker)))))
+               (chmod compiler #o555))
+             (with-directory-excursion bindir
+               (chmod "." #o755)
+               (map wrap-compiler '("gcc" "g++"))))))))
     (inputs
      `(("tar" ,(bootstrap-executable "tar" (%current-system)))
        ("xz"  ,(bootstrap-executable "xz" (%current-system)))