From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33400) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g8mSB-0006KB-Tv 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 1g8mS7-00026G-5b for guix-patches@gnu.org; Sat, 06 Oct 2018 09:17:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:34137) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g8mS7-00026A-1R for guix-patches@gnu.org; Sat, 06 Oct 2018 09:17:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1g8mS6-0002rY-Ru for guix-patches@gnu.org; Sat, 06 Oct 2018 09:17:02 -0400 Subject: [bug#32953] [PATCH core-updates-next 3/8] gnu: gcc-boot0: Improve gcc-wrapper workarounds. Resent-Message-ID: From: Marius Bakke Date: Sat, 6 Oct 2018 15:16:34 +0200 Message-Id: <20181006131639.8424-3-mbakke@fastmail.com> In-Reply-To: <20181006131639.8424-1-mbakke@fastmail.com> References: <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-boot0)[arguments]: Adjust the libcc1 build scripts instead of copying libcc1.so from %BOOT0-INPUTS. --- gnu/packages/commencement.scm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index c4f112578..5bfd314c6 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1810,13 +1810,18 @@ exec " gcc "/bin/" program #t))) ,(match (%current-system) ((or "i686-linux" "x86_64-linux") - '(add-after 'build 'libtool-workaround - (lambda _ - ;; libtool: install: /gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install -c .libs/libcc1.so.0.0.0 /gnu/store/8qf47i99nxz9jvrmq5va0g3q1yvs3x74-gcc-cross-boot0-5.5.0-lib/lib/./libcc1.so.0.0.0 - ;; /gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install: cannot stat '.libs/libcc1.so.0.0.0': No such file or directory - (system* "touch" - "libcc1/.libs/libcc1.so.0.0.0" - "libcc1/.libs/libcc1plugin.so.0.0.0")))) + '(add-before 'configure 'fix-libcc1 + (lambda* (#:key inputs #:allow-other-keys) + ;; libcc1.so NEEDs libgcc_s.so, so provide one here + ;; to placate the 'validate-runpath' phase. + (substitute* "libcc1/Makefile.in" + (("la_LDFLAGS =") + (string-append "la_LDFLAGS = -Wl,-rpath=" + (assoc-ref inputs "gcc") "/lib"))) + ;; XXX: "g++ -v" is broken (see also libstdc++ above). + (substitute* "libcc1/configure" + (("g\\+\\+ -v") "true")) + #t))) (_ identity)) (add-after 'install 'symlink-libgcc_eh (lambda* (#:key outputs #:allow-other-keys) -- 2.19.0