mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-03-05 14:06:27 -05:00
Merge bitcoin/bitcoin#26059: Revert "guix: Build depends/qt with our platform definition"
beb94261ea
Revert "guix: Build depends/qt with our platform definition" (Hennadii Stepanov) Pull request description: This PR reverts commitdc4137a60c
. It is no longer required after bitcoin/bitcoin#25838. Guix build on `x86_64`: ``` 2896943c8379f5bfe187666862e0cfcb619bd6c4c98ec6a25cadba1a3e15dad7 guix-build-beb94261ea9d/output/dist-archive/bitcoin-beb94261ea9d.tar.gz 9c829d2c488b07b181fd90590e0ac763761edfa1d231daccd5d25038707f321c guix-build-beb94261ea9d/output/x86_64-linux-gnu/SHA256SUMS.part 2393a54db15ae372e974f562438c3cd6be3dbde07c3090c1ae884cc6941e7d26 guix-build-beb94261ea9d/output/x86_64-linux-gnu/bitcoin-beb94261ea9d-x86_64-linux-gnu-debug.tar.gz 397f9c023d41a6bf2a8844121badbbd0066e45304e1e085e217e9a0b5d42f088 guix-build-beb94261ea9d/output/x86_64-linux-gnu/bitcoin-beb94261ea9d-x86_64-linux-gnu.tar.gz ``` ACKs for top commit: fanquake: ACKbeb94261ea
jarolrod: ACKbeb94261ea
Tree-SHA512: f4adba91df28db2e2bbcbf9cf1c119f48285f777e1965db1535c734f5e8a0d34944e122fa517e79758661ea71080ee8267e0e475c260fe46a7d0bd9149d16dc8
This commit is contained in:
commit
995fdef14a
1 changed files with 0 additions and 1 deletions
|
@ -196,7 +196,6 @@ make -C depends --jobs="$JOBS" HOST="$HOST" \
|
|||
x86_64_linux_RANLIB=x86_64-linux-gnu-ranlib \
|
||||
x86_64_linux_NM=x86_64-linux-gnu-nm \
|
||||
x86_64_linux_STRIP=x86_64-linux-gnu-strip \
|
||||
qt_config_opts_x86_64_linux='-platform linux-g++ -xplatform bitcoin-linux-g++' \
|
||||
FORCE_USE_SYSTEM_CLANG=1
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue