diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-11-10 11:05:37 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-11-11 12:18:37 -0500 |
| commit | d26584fcdac80058eea9a98be89ed120945e0b1b (patch) | |
| tree | a016d784eaab780fb3a12733102acf740d934517 /gnu/packages/base.scm | |
| parent | ac6f6772496378893a8ebfce4bf1707aed2fe089 (diff) | |
| download | guix-d26584fcdac80058eea9a98be89ed120945e0b1b.tar.gz | |
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.
Diffstat (limited to 'gnu/packages/base.scm')
| -rw-r--r-- | gnu/packages/base.scm | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index c2db2f0b1d..043c9ad4d8 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)) |