nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Marius Bakke 2018-10-03 17:16:08 +02:00 committed by Jan Nieuwenhuizen
parent a6facf9482
commit 77e02d948c
No known key found for this signature in database
GPG Key ID: F3C1A0D9C1D65273
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gnu/packages/commencement.scm
View File

@ -1731,13 +1731,18 @@ exec " gcc "/bin/" program
#t))) #t)))
,(match (%current-system) ,(match (%current-system)
((or "i686-linux" "x86_64-linux") ((or "i686-linux" "x86_64-linux")
'(add-after 'build 'libtool-workaround '(add-before 'configure 'fix-libcc1
(lambda _ (lambda* (#:key inputs #:allow-other-keys)
;; 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 ;; libcc1.so NEEDs libgcc_s.so, so provide one here
;; /gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install: cannot stat '.libs/libcc1.so.0.0.0': No such file or directory ;; to placate the 'validate-runpath' phase.
(system* "touch" (substitute* "libcc1/Makefile.in"
"libcc1/.libs/libcc1.so.0.0.0" (("la_LDFLAGS =")
"libcc1/.libs/libcc1plugin.so.0.0.0")))) (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)) (_ identity))
(add-after 'install 'symlink-libgcc_eh (add-after 'install 'symlink-libgcc_eh
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)