~ruther/guix-local

d93bb701a04ffd90b8d69b3c8896508388d71102 — Maxim Cournoyer 4 months ago 267c864
Revert "gnu: binutils-final: Enable zstd support."

This reverts commit 0c1de511f8fd81b5325160ea624e2953dd32ad84.
1 files changed, 6 insertions(+), 9 deletions(-)

M gnu/packages/commencement.scm
M gnu/packages/commencement.scm => gnu/packages/commencement.scm +6 -9
@@ 3241,8 3241,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
                                            "libstdc++")
                                          ,@(if (target-powerpc? (%current-system))
                                                (list static-bash-for-glibc)
                                                '())
                                          ,(gexp-input zstd-final "lib")))
                                                '())))
             (substitute-keyword-arguments (package-arguments binutils)
               ((#:configure-flags flags #~'())
                ;; For gprofng, tell the build system where to look for libstdc++.


@@ 3252,15 3251,13 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
                                                  "libstdc++")
                                               "/lib")))))))
    (native-inputs (list bison-boot0
                         pkg-config-final ;to detect zstd
                         libstdc++))              ;for gprofng
    (inputs
     (modify-inputs (match (%current-system)
                      ((? target-powerpc?)
                       `(("bash" ,static-bash-for-glibc)
                         ,@(%boot2-inputs)))
                      (_ (%boot2-inputs)))
       (append `(,zstd-final "lib"))))))
     (match (%current-system)
       ((? target-powerpc?)
        `(("bash" ,static-bash-for-glibc)
          ,@(%boot2-inputs)))
       (_ (%boot2-inputs))))))

(define zlib-final
  ;; Zlib used by GCC-FINAL.