From f4bf64138c9628114173e999f080c4fad3fec975 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Oct 2018 17:08:02 +0200 Subject: gnu: Remove gcc-for-libstdc++. * gnu/packages/commencement.scm (gcc-for-libstdc++): Remove variable. (libstdc++-boot0): Inherit GCC-4.9 instead. --- gnu/packages/commencement.scm | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 3d3f8e6650..015211f493 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1620,25 +1620,12 @@ (define (remove-triplet-prefix name) ,cf))))) (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 ;; GCC's libcc1 is always built as a shared library (the top-level ;; 'Makefile.def' forcefully adds --enable-shared) and thus needs to refer ;; to libstdc++.so. We cannot build libstdc++-5.3 because it relies on ;; 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 (inherit lib) (name "libstdc++-boot0") -- cgit v1.2.3