TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: make-libstdc++: Unconditionally apply powerpc substitution.

Browse source 
* gnu/packages/gcc.scm (make-libstdc++)[arguments]: Use modify-phases.
Apply powerpc directory substitution on all architectures.
This commit is contained in:
Efraim Flashner 2021-03-24 15:44:24 +02:00
parent 8f0cd6575d
commit 6dd338ee1b
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gnu/packages/gcc.scm
View file

@ -596,25 +596,16 @@ (define-public (make-libstdc++ gcc)
(arguments
`(#:out-of-source? #t
#:phases
;; TODO: Use the target-powerpc arm for everyone.
,(if (target-powerpc?)
`(modify-phases %standard-phases
;; Force rs6000 (i.e., powerpc) libdir to be /lib and not /lib64.
(add-before 'chdir 'fix-rs6000-libdir
(lambda _
(when (file-exists? "gcc/config/rs6000")
(substitute* (find-files "gcc/config/rs6000")
(("/lib64") "/lib")))
#t))
(add-before 'configure 'chdir
(lambda _
(chdir "libstdc++-v3")
#t)))
`(alist-cons-before 'configure 'chdir
(lambda _
(chdir "libstdc++-v3")
#t)
%standard-phases))
(modify-phases %standard-phases
;; Force rs6000 (i.e., powerpc) libdir to be /lib and not /lib64.
(add-before 'chdir 'fix-rs6000-libdir
(lambda _
(when (file-exists? "gcc/config/rs6000")
(substitute* (find-files "gcc/config/rs6000")
(("/lib64") "/lib")))))
(add-before 'configure 'chdir
(lambda _
(chdir "libstdc++-v3"))))
#:configure-flags `("--disable-libstdcxx-pch"
,(string-append "--with-gxx-include-dir="