03/03: squash! squash! gnu: bootstrap: %bootstrap-gcc: Also wrap g++.

[guix-commits]

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

commit be2fc9e63148b38c242e7335e4904007fd080d9f
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Thu Nov 21 09:21:20 2024 +0100

    squash! squash! gnu: bootstrap: %bootstrap-gcc: Also wrap g++.
    
    Change-Id: I37e5ba81b68b8d6fbd359733395810600cf2eff3
---
 gnu/packages/bootstrap.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index e1ce59d7d1..b1b573782f 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -870,9 +870,6 @@ $out/bin/guile --version~%"
            (invoke xz "-d" "binaries.tar.xz")
            (let ((builddir (getcwd))
                  (bindir   (string-append out "/bin")))
-             (with-directory-excursion out
-               (invoke tar "xvf"
-                       (string-append builddir "/binaries.tar")))
 
              (define (wrap-program program)
                (let ((wrapped (format #f ".~a-wrapped" program)))
@@ -888,6 +885,11 @@ exec ~a/bin/~a -B~a/lib \
                              libc libc libc
                              ,(glibc-dynamic-linker)))))
                (chmod program #o555))
+
+             (with-directory-excursion out
+               (invoke tar "xvf"
+                       (string-append builddir "/binaries.tar")))
+
              (with-directory-excursion bindir
                (chmod "." #o755)
                (for-each wrap-program '("gcc" "g++"))))))))