nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: libstdc++-boot0: Improve gcc-wrapper workaround. 

* gnu/packages/commencement.scm (libstdc++-boot0): Adjust the configure script
instead of copying libstdc++.so from %BOOT0-INPUTS.
This commit is contained in:
Marius Bakke 2018-10-03 17:13:06 +02:00 committed by Jan Nieuwenhuizen
parent f4bf64138c
commit a6facf9482
No known key found for this signature in database
GPG Key ID: F3C1A0D9C1D65273
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/packages/commencement.scm
View File

@ -1641,17 +1641,13 @@ exec " gcc "/bin/" program
(substitute-keyword-arguments (package-arguments lib) (substitute-keyword-arguments (package-arguments lib)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
;; FIXME: why doesn't this package build libstdc++.so.6.0.20, (add-after 'unpack 'workaround-wrapper-bug
;; when gcc-mesboot builds it fine? ;; XXX: The crude gcc-cross-wrapper causes "g++ -v" to
;; 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 ;; fail, which in turn confuses the configure script.
;; /gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install: cannot stat '.libs/libstdc++.so.6.0.20': No such file or directory (lambda _
(add-after 'build 'copy-libstdc++- (substitute* "libstdc++-v3/configure"
(lambda* (#:key outputs #:allow-other-keys) (("g\\+\\+ -v") "true"))
(let ((gcc (assoc-ref %build-inputs "gcc")) #t))))))
(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))))) (_ (package-arguments lib)))))
(inputs (%boot0-inputs)) (inputs (%boot0-inputs))
(native-inputs '())))) (native-inputs '()))))