05/05: gnu: libstdc++-boot0: Copy libstdc++.so.6.0.20 to pass install.

[Jan Nieuwenhuizen]

janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit 7ab917a56cf59b3e227559c6e5a8b47811895dbb
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Thu Sep 6 21:35:51 2018 +0200

    gnu: libstdc++-boot0: Copy libstdc++.so.6.0.20 to pass install.
    
    * gnu/packages/commencement.scm (libstdc++-boot0): Copy libstdc++.so.6.0.20 
to
    pass install.
---
 gnu/packages/commencement.scm | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index acbe090..cc153e2 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1766,7 +1766,22 @@ exec " gcc "/bin/" program
          ;; XXX: libstdc++.so NEEDs ld.so for some reason.
          #:validate-runpath? #f
 
-         ,@(package-arguments lib)))
+         ,@(match (%current-system)
+             ("i686-linux"
+              (substitute-keyword-arguments (package-arguments lib)
+                ((#:phases phases)
+                 `(modify-phases ,phases
+                    ;; FIXME: why doesn't this package build 
libstdc++.so.6.0.20,
+                    ;; when gcc-mesboot builds it fine?
+                    (add-after 'build 'copy-libstdc++-
+                      (lambda* (#:key outputs #:allow-other-keys)
+                        (format (current-error-port) "HIERO\n")
+                        (let ((gcc (assoc-ref %build-inputs "gcc"))
+                              (out (assoc-ref outputs "out")))
+                          (copy-file (string-append gcc 
"/lib/libstdc++.so.6.0.20")
+                                     (string-append 
"src/.libs/libstdc++.so.6.0.20"))
+                          #t)))))))
+             (_ (package-arguments lib)))))
       (inputs (%boot0-inputs))
       (native-inputs '()))))