1 files changed, 9 insertions(+), 6 deletions(-)

M gnu/packages/commencement.scm

@@ 3241,7 3241,8 @@ 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++.


@@ 3251,13 3252,15 @@ 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
-     (match (%current-system)
-       ((? target-powerpc?)
-        `(("bash" ,static-bash-for-glibc)
-          ,@(%boot2-inputs)))
-       (_ (%boot2-inputs))))))
+     (modify-inputs (match (%current-system)
+                      ((? target-powerpc?)
+                       `(("bash" ,static-bash-for-glibc)
+                         ,@(%boot2-inputs)))
+                      (_ (%boot2-inputs)))
+       (append `(,zstd-final "lib"))))))
 
 (define zlib-final
   ;; Zlib used by GCC-FINAL.