[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/06: gnu: gcc-4.7: Unconditionally apply powerpc substitution.
From: |
guix-commits |
Subject: |
04/06: gnu: gcc-4.7: Unconditionally apply powerpc substitution. |
Date: |
Wed, 24 Mar 2021 15:01:19 -0400 (EDT) |
efraim pushed a commit to branch core-updates
in repository guix.
commit 8f0cd6575dc2f933a86b8b0a3d193813712b1ff0
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Wed Mar 24 15:42:16 2021 +0200
gnu: gcc-4.7: Unconditionally apply powerpc substitution.
* gnu/packages/gcc.scm (gcc-4.7)[arguments]: Adjust 'pre-configure phase
to always apply powerpc substitution.
---
gnu/packages/gcc.scm | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 061bd86..b64f933 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -274,13 +274,10 @@ where the OS part is overloaded to denote a specific
ABI---into GCC
~a"
libc line))))
- ;; 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"))))
- `())
+ (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"
- branch core-updates created (now f08b070), guix-commits, 2021/03/24
- 02/06: Merge remote-tracking branch 'origin/master' into core-updates, guix-commits, 2021/03/24
- 05/06: gnu: make-libstdc++: Unconditionally apply powerpc substitution., guix-commits, 2021/03/24
- 01/06: gnu: python-pygments: Update to 2.8.1 [security fixes]., guix-commits, 2021/03/24
- 04/06: gnu: gcc-4.7: Unconditionally apply powerpc substitution.,
guix-commits <=
- 06/06: gnu: findutils-boot0: Fix test suite on some systems., guix-commits, 2021/03/24
- 03/06: gnu: glibc: Absorb powerpc patch., guix-commits, 2021/03/24