[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch wip-ppc64le updated: squash! (also) gcc-4.7: On powerpc64le, fix
From: |
guix-commits |
Subject: |
branch wip-ppc64le updated: squash! (also) gcc-4.7: On powerpc64le, fix /lib64 references |
Date: |
Wed, 10 Mar 2021 09:20:13 -0500 |
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 94f46b1 squash! (also) gcc-4.7: On powerpc64le, fix /lib64 references
94f46b1 is described below
commit 94f46b16743020d3e9b9c8dc3436c9696009fd3d
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Wed Mar 10 16:19:31 2021 +0200
squash! (also) 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 | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 31c0ee0..07627e0 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -274,10 +274,13 @@ where the OS part is overloaded to denote a specific
ABI---into GCC
~a"
libc line))))
- (when (file-exists? "gcc/config/rs6000")
- ;; Force powerpc libdir to be /lib and not /lib64
- (substitute* (find-files "gcc/config/rs6000")
- (("/lib64") "/lib")))
+ ;; TODO: Make this unconditional in core-updates.
+ ,@(if (target-powerpc?)
+ '((when (file-exists? "gcc/config/rs6000")
+ ;; Force powerpc libdir to be /lib and not /lib64
+ (substitute* (find-files "gcc/config/rs6000")
+ (("/lib64") "/lib"))))
+ `())
;; Don't retain a dependency on the build-time sed.
(substitute* "fixincludes/fixincl.x"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch wip-ppc64le updated: squash! (also) gcc-4.7: On powerpc64le, fix /lib64 references,
guix-commits <=