[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/08: gnu: gcc-boot0: Improve gcc-wrapper workarounds.
From: |
Marius Bakke |
Subject: |
03/08: gnu: gcc-boot0: Improve gcc-wrapper workarounds. |
Date: |
Sat, 6 Oct 2018 12:59:45 -0400 (EDT) |
mbakke pushed a commit to branch wip-gcc7
in repository guix.
commit c697fdfc1861d610ae57810a519fbb571f300d22
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 c4f1125..5bfd314 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)
- branch wip-gcc7 created (now f47d100), Marius Bakke, 2018/10/06
- 04/08: gnu: Remove duplicate linux-libre-headers package from bootstrap inputs., Marius Bakke, 2018/10/06
- 06/08: gnu: python: Fix FTBFS with GCC >= 6., Marius Bakke, 2018/10/06
- 07/08: gnu: cmake: Try CPATH and C_INCLUDE_PATH when finding system libraries., Marius Bakke, 2018/10/06
- 05/08: gnu: Use GCC 7 as the default compiler., Marius Bakke, 2018/10/06
- 02/08: gnu: libstdc++-boot0: Improve gcc-wrapper workaround., Marius Bakke, 2018/10/06
- 01/08: gnu: Remove gcc-for-libstdc++., Marius Bakke, 2018/10/06
- 08/08: gnu: cppunit: Update to 1.14.0., Marius Bakke, 2018/10/06
- 03/08: gnu: gcc-boot0: Improve gcc-wrapper workarounds.,
Marius Bakke <=