me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Maxim Cournoyer 2021-11-10 11:05:37 -05:00
parent ac6f677249
commit d26584fcda
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gnu/packages/base.scm
View File

@ -523,8 +523,6 @@ change. GNU make offers many powerful extensions over the standard utility.")
(patches (search-patches "binutils-loongson-workaround.patch" (patches (search-patches "binutils-loongson-workaround.patch"
"binutils-2.37-file-descriptor-leak.patch")))) "binutils-2.37-file-descriptor-leak.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; TODO: Add dependency on zlib + those for Gold.
(arguments (arguments
`(#:configure-flags '(;; Add `-static-libgcc' to not retain a dependency `(#:configure-flags '(;; Add `-static-libgcc' to not retain a dependency
;; on GCC when bootstrapping. ;; on GCC when bootstrapping.
@ -595,29 +593,21 @@ included.")
(properties '()))) (properties '())))
(define-public binutils-gold (define-public binutils-gold
(package/inherit binutils (package/inherit binutils-next
(name "binutils-gold") (name "binutils-gold")
(arguments (arguments
`(#:phases (substitute-keyword-arguments (package-arguments binutils)
(modify-phases %standard-phases ((#:configure-flags flags)
(add-after 'patch-source-shebangs 'patch-more-shebangs `(cons* "--enable-gold=default"
(lambda _ (delete "LDFLAGS=-static-libgcc" ,flags)))
(substitute* "gold/Makefile.in" ((#:phases phases '%standard-phases)
(("/bin/sh") (which "sh")))))) `(modify-phases ,phases
,@(substitute-keyword-arguments (package-arguments binutils) (add-after 'patch-source-shebangs 'patch-more-shebangs
; Upstream is aware of unrelocatable test failures on arm*. (lambda _
((#:tests? _ #f) (substitute* "gold/Makefile.in"
(if (any (cute string-prefix? <> (or (%current-target-system) (("/bin/sh") (which "sh")))))))))
(%current-system))) (native-inputs
'("i686" "x86_64")) `(("bc" ,bc)))))
'#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")))))
(define* (make-ld-wrapper name #:key (define* (make-ld-wrapper name #:key
(target (const #f)) (target (const #f))