From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33393) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g8mSB-0006K7-Ss for guix-patches@gnu.org; Sat, 06 Oct 2018 09:17:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g8mS6-000256-7O for guix-patches@gnu.org; Sat, 06 Oct 2018 09:17:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:34135) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g8mS6-000251-2E for guix-patches@gnu.org; Sat, 06 Oct 2018 09:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1g8mS5-0002rJ-TU for guix-patches@gnu.org; Sat, 06 Oct 2018 09:17:01 -0400 Subject: [bug#32953] [PATCH core-updates-next 1/8] gnu: Remove gcc-for-libstdc++. References: <20181006131420.8131-1-mbakke@fastmail.com> In-Reply-To: <20181006131420.8131-1-mbakke@fastmail.com> Resent-Message-ID: From: Marius Bakke Date: Sat, 6 Oct 2018 15:16:32 +0200 Message-Id: <20181006131639.8424-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 32953@debbugs.gnu.org * 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(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 4c7a38134..46d2a4629 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1699,25 +1699,12 @@ exec " gcc "/bin/" program ,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") -- 2.19.0