apteryx pushed a commit to branch core-updates-frozen
in repository guix.
commit d26584fcdac80058eea9a98be89ed120945e0b1b
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Wed Nov 10 11:05:37 2021 -0500
gnu: binutils-gold: Inherit from binutils-next.
And reinstate tests on non-x86 architectures, as the past problems now
appear
to be resolved.
* gnu/packages/base.scm (binutils-gold): Inherit from binutils-next.
[tests?]: Remove argument.
[inputs]: Remove gcc:lib, which is already included implicitly.
---
gnu/packages/base.scm | 36 +++++++++++++-----------------------
1 file changed, 13 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index c2db2f0..043c9ad 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -523,8 +523,6 @@ change. GNU make offers many powerful extensions over the
standard utility.")
(patches (search-patches "binutils-loongson-workaround.patch"
"binutils-2.37-file-descriptor-leak.patch"))))
(build-system gnu-build-system)
-
- ;; TODO: Add dependency on zlib + those for Gold.
(arguments
`(#:configure-flags '(;; Add `-static-libgcc' to not retain a dependency
;; on GCC when bootstrapping.
@@ -595,29 +593,21 @@ included.")
(properties '())))
(define-public binutils-gold
- (package/inherit binutils
+ (package/inherit binutils-next
(name "binutils-gold")
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'patch-source-shebangs 'patch-more-shebangs
- (lambda _
- (substitute* "gold/Makefile.in"
- (("/bin/sh") (which "sh"))))))
- ,@(substitute-keyword-arguments (package-arguments binutils)
- ; Upstream is aware of unrelocatable test failures on arm*.
- ((#:tests? _ #f)
- (if (any (cute string-prefix? <> (or (%current-target-system)
- (%current-system)))
- '("i686" "x86_64"))
- '#t '#f))
- ((#:configure-flags flags)
- `(cons* "--enable-gold=default"
- (delete "LDFLAGS=-static-libgcc" ,flags))))))
- (native-inputs
- `(("bc" ,bc)))
- (inputs
- `(("gcc:lib" ,(canonical-package gcc) "lib")))))
+ (substitute-keyword-arguments (package-arguments binutils)
+ ((#:configure-flags flags)
+ `(cons* "--enable-gold=default"
+ (delete "LDFLAGS=-static-libgcc" ,flags)))
+ ((#:phases phases '%standard-phases)
+ `(modify-phases ,phases
+ (add-after 'patch-source-shebangs 'patch-more-shebangs
+ (lambda _
+ (substitute* "gold/Makefile.in"
+ (("/bin/sh") (which "sh")))))))))
+ (native-inputs
+ `(("bc" ,bc)))))
(define* (make-ld-wrapper name #:key
(target (const #f))
