0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-05 14:06:27 -05:00

Merge bitcoin/bitcoin#30534: guix: move bison from global scope, to Linux

e6df3485ed guix: move bison from global scope, to Linux (fanquake)

Pull request description:

  This is only needed for the Qt build (libxkbcommon), on Linux, so does not need to be built/present for the macOS or Windows builds.

ACKs for top commit:
  hebasto:
    ACK e6df3485ed.
  TheCharlatan:
    ACK e6df3485ed

Tree-SHA512: b66111e398b4fce88f912adfd808d537e2d85e1f0078befd264bb700b201ca1bbe322810e80a212e0023657e9e3693a106761c43743d66aabd16e2afe7f599e6
This commit is contained in:
merge-script 2024-07-29 10:08:07 +01:00
commit ec7ba7a3cf
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1

View file

@ -522,7 +522,6 @@ inspecting signatures in Mach-O binaries.")
autoconf-2.71
automake
pkg-config
bison
;; Scripting
python-minimal ;; (3.10)
;; Git
@ -537,7 +536,8 @@ inspecting signatures in Mach-O binaries.")
nss-certs
osslsigncode))
((string-contains target "-linux-")
(list (list gcc-toolchain-12 "static")
(list bison
(list gcc-toolchain-12 "static")
(make-bitcoin-cross-toolchain target)))
((string-contains target "darwin")
(list clang-toolchain-18