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

gnu: Remove gcc-for-libstdc++. 

* gnu/packages/commencement.scm (gcc-for-libstdc++): Remove variable.
(libstdc++-boot0): Inherit GCC-4.9 instead.
This commit is contained in:
Marius Bakke 2018-10-03 17:08:02 +02:00 committed by Jan Nieuwenhuizen
parent 3d3daf7fa1
commit f4bf64138c
No known key found for this signature in database
GPG Key ID: F3C1A0D9C1D65273
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/commencement.scm
View File

@ -1620,25 +1620,12 @@ exec " gcc "/bin/" program
,cf))))) ,cf)))))
(inputs (%boot0-inputs))))) (inputs (%boot0-inputs)))))
;; Use a "fixed" package source for this early libstdc++ variant so we can
;; update GCC 4.9 without triggering a full rebuild.
(define gcc-for-libstdc++
(package
(inherit gcc-4.9)
(source (origin
(inherit (package-source gcc-4.9))
(patches (search-patches "gcc-4.9-libsanitizer-fix.patch"
"gcc-arm-bug-71399.patch"
"gcc-asan-missing-include.patch"
"gcc-libvtv-runpath.patch"
"gcc-fix-texi2pod.patch"))))))
(define libstdc++-boot0 (define libstdc++-boot0
;; GCC's libcc1 is always built as a shared library (the top-level ;; GCC's libcc1 is always built as a shared library (the top-level
;; 'Makefile.def' forcefully adds --enable-shared) and thus needs to refer ;; 'Makefile.def' forcefully adds --enable-shared) and thus needs to refer
;; to libstdc++.so. We cannot build libstdc++-5.3 because it relies on ;; to libstdc++.so. We cannot build libstdc++-5.3 because it relies on
;; C++14 features missing in some of our bootstrap compilers. ;; C++14 features missing in some of our bootstrap compilers.
(let ((lib (package-with-bootstrap-guile (make-libstdc++ gcc-for-libstdc++)))) (let ((lib (package-with-bootstrap-guile (make-libstdc++ gcc-4.9))))
(package (package
(inherit lib) (inherit lib)
(name "libstdc++-boot0") (name "libstdc++-boot0")