janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit a9aff397ff3ee65aa3e641b2d9a2bf9506a7b98e
Author: Jan Nieuwenhuizen <[email protected]>
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 | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index acbe090..8a757f1 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1766,7 +1766,23 @@ 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?
+ ;; libtool: install:
/gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install -c
.libs/libstdc++.so.6.0.20
/gnu/store/np5pmdlwfin3vmqk88chh0fgs0ncki79-libstdc++-boot0-4.8.5/lib/libstdc++.so.6.0.20
+ ;;
/gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install:
cannot stat '.libs/libstdc++.so.6.0.20': No such file or directory
+ (add-after 'build 'copy-libstdc++-
+ (lambda* (#:key outputs #:allow-other-keys)
+ (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 '()))))
