[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/06: gnu: gcc-boot0: Improve gcc-wrapper workarounds.
From: |
guix-commits |
Subject: |
05/06: gnu: gcc-boot0: Improve gcc-wrapper workarounds. |
Date: |
Sat, 24 Nov 2018 02:20:27 -0500 (EST) |
janneke pushed a commit to branch core-updates-next
in repository guix.
commit 77e02d948c9e16ae894ea0eba2c1e706d03d09e1
Author: Marius Bakke <address@hidden>
Date: Wed Oct 3 17:16:08 2018 +0200
gnu: gcc-boot0: Improve gcc-wrapper workarounds.
* 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 467a158..f977042 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1731,13 +1731,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)
- branch core-updates-next updated (d9ed0a4 -> 4ae7dc7), guix-commits, 2018/11/24
- 06/06: gnu: Remove duplicate linux-libre-headers package from bootstrap inputs., guix-commits, 2018/11/24
- 05/06: gnu: gcc-boot0: Improve gcc-wrapper workarounds.,
guix-commits <=
- 03/06: gnu: Remove gcc-for-libstdc++., guix-commits, 2018/11/24
- 02/06: doc: Update for bootstrap-mescc-tools change., guix-commits, 2018/11/24
- 01/06: bootstrap: Force i686-linux for bootstrap-tarballs., guix-commits, 2018/11/24
- 04/06: gnu: libstdc++-boot0: Improve gcc-wrapper workaround., guix-commits, 2018/11/24