This is an automated email from the git hooks/post-receive script.
efraim pushed a commit to branch wip-ppc64le
in repository guix.
The following commit(s) were added to refs/heads/wip-ppc64le by this push:
new efd17e1 squash! gcc-4.7: On powerpc64le, fix /lib64 references
efd17e1 is described below
commit efd17e1e1b1aef19149be83bb46a5bf7ea3bfa12
Author: Efraim Flashner <[email protected]>
AuthorDate: Wed Mar 10 16:10:45 2021 +0200
squash! gcc-4.7: On powerpc64le, fix /lib64 references
This allows powerpc64le and the other architectures to have their own
code paths until they can be merged.
---
gnu/packages/gcc.scm | 35 ++++++++++++++++++++++-------------
1 file changed, 22 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index cdb26d6..31c0ee0 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <[email protected]>
;;; Copyright © 2014, 2015, 2016, 2017, 2019 Ricardo Wurmus
<[email protected]>
;;; Copyright © 2015 Andreas Enge <[email protected]>
-;;; Copyright © 2015, 2016, 2017, 2018, 2020 Efraim Flashner
<[email protected]>
+;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2021 Efraim Flashner
<[email protected]>
;;; Copyright © 2016 Carlos Sánchez de La Lama <[email protected]>
;;; Copyright © 2018 Tobias Geerinckx-Rice <[email protected]>
;;; Copyright © 2018, 2020 Marius Bakke <[email protected]>
@@ -596,18 +596,27 @@ using compilers other than GCC."
(arguments
`(#:out-of-source? #t
#:phases
- (modify-phases %standard-phases
- ;; Force rs6000 (i.e., powerpc) libdir to be /lib and not /lib64.
- (add-before 'configure '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)))
+ ;; 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.
+ ;; This should be after 'unpack, or before 'chdir.
+ (add-before 'configure '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))
+
#:configure-flags `("--disable-libstdcxx-pch"
,(string-append "--with-gxx-include-dir="
(assoc-ref %outputs "out")
