This switches us to using a LLD based toolchain for macOS builds.
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--006a51241073e994b41acfe9ec718e94-->
For detailed information about the code coverage, see the test coverage report.
<!--021abf342d371248e50ceaed478a90ca-->
See the guideline for information on the review process.
| Type | Reviewers |
|---|---|
| ACK | theuni |
| Concept ACK | hebasto, michaelfolkson |
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.
<!--174a7506f384e20aa4161008e828411d-->
Reviewers, this pull request conflicts with the following ones:
-no_exported_symbols on macOS by fanquake)If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
This definitely seems like a good thing to add support for, but it seems sad to have to drop support for the open source compiler at the same time as adding support for the closed source one. I don't know enough about this to have an informed opinion, though.
EDIT: Just a misunderstanding
but it seems sad to have to drop support for the open source compiler at the same time as adding support for the closed source one.
I might be misunderstanding your comment, but the opposite is happening here. We're migrating away from using Apples, irregularly open sourced tools (cctools, ld64), to just vanilla LLVM (lld), which is entirely open source.
I might be misunderstanding your comment, but the opposite is happening here. We're migrating away from using Apples, irregularly open sourced tools (cctools, ld64), to just vanilla LLVM (lld), which is entirely open source.
My bad! I thought this was switching from an unsupported apple open-source toolchain to an supported apple closed source toolchain, not to a vanilla toolchain. My blinding hate of apple has kept me from seeing reality! Thanks for the clarification. This all seems very good.
Very nice! Strong concept ACK, but obviously we can't use this until all features we need are supported. But it's great to see that linking finally works!
For a little extra context beyond what @fanquake said above, the macOS clang+cctools build has always been a wonky outlier because we have to build our own (very unsupported) toolchain first. LD64 is apple's libre/open-source linker, and there is a community project that maintains a build environment for cross builds.
For a few years, there has been slow development on a darwin functionality for llvm's lld, but it's only really picked up speed and become usable in the last year or two. This PR would bring our Apple builds much more inline with others in that it would finally be using a supported libre/open-source compiler/linker combo. @fanquake Is cctools still needed at all? LLVM ships bitcode equivalents of most binutils tools (ar, nm, ranlib, etc), I wonder if we can use those instead. Maybe they require lto?
Is cctools still needed at all? LLVM ships bitcode equivalents of most binutils tools (ar, nm, ranlib, etc), I wonder if we can use those instead. Maybe they require lto? @theuni no cctools is no longer required. I drop the native_cctools as part of this PR and we just use the LLVM tools.
@theuni no cctools is no longer required. I drop the native_cctools as part of this PR and we just use the LLVM tools.
Apologies for reading too quickly, I see now that I only looked at the first commit. Turns out the 3rd one is the one I expected :)
Rebased for #21793, and rebased on top of #19817. Made some additional changes, such as renaming the native_cctools package to native_llvm, and removed some now-redundant info from the macdeploy documentation.
Note: I'm pretty sure the use of ZERO_AR_DATE can now be dropped entirely, but have left that out for now.
Sorry for the noise. This is now pointing at LLVM 14.0.0 rc2, and no longer using binaries I compiled, given the release on GitHub has the binaries we need.
The build is currently failing for Qt, something to follow up with:
1 warning generated.
x86_64-apple-darwin-ranlib: error: Invalid option: '-no_warning_for_no_symbols'
make[4]: *** [Makefile:436: ../../lib/libQt5Network.a] Error 1
Concept ACK.
0 | @@ -0,0 +1,34 @@ 1 | +package=native_llvm 2 | +$(package)_version=14.0.0-rc2 3 | +ifneq (,$(findstring aarch64,$(BUILD))) 4 | +$(package)_download_path=https://github.com/llvm/llvm-project/releases/download/llvmorg-$($(package)_version)
This line could moved out of ifneq statement,
Done in next push.
The build is currently failing for Qt, something to follow up with:
1 warning generated. x86_64-apple-darwin-ranlib: error: Invalid option: '-no_warning_for_no_symbols' make[4]: *** [Makefile:436: ../../lib/libQt5Network.a] Error 1
I think the https://github.com/qt/qtbase/commit/9a1eb86f3d4cd4b0d99f053f9bc9d304289b99f7 commit is responsible for that error. Reverting of its changes in mkspecs/features/qt_build_config.prf should fix the error.
I'm still wondering why does the Qt build system recognize llvm's clang as Apple's clang:
$ make -C depends qt_configured HOST=x86_64-apple-darwin
...
Configure summary:
Building on: linux-g++ (x86_64, CPU features: mmx sse sse2)
Building for: macx-clang-linux (x86_64, CPU features: cx16 mmx sse sse2 sse3 ssse3 sse4.1)
Target compiler: clang (Apple) 14.0.0
Configuration: cross_compile sse2 aesni sse3 ssse3 sse4_1 sse4_2 avx avx2 avx512f avx512bw avx512cd avx512dq avx512er avx512ifma avx512pf avx512vbmi avx512vl f16c largefile precompile_header rdrnd rdseed shani silent x86SimdAlways release c++11 c++14 c++17 c++1z reduce_exports static stl
?
Here is the relevant Qt's code:
# ifdef __apple_build_version__ // Apple clang has other version numbers
# define COMPILER_STRING "Clang " __clang_version__ " (Apple)"
# else
# define COMPILER_STRING "Clang " __clang_version__
# endif
Rebased to include #24613.
Reverting of its changes in mkspecs/features/qt_build_config.prf should fix the error.
I've added a qt patch that does this. However note that bitcoin-qt still isn't being built because of duplicate symbol issues when running our configure checks.
Note that this week the review club is looking at this PR. There are improvements / changes that could be made here, some which I noticed while writing the questions, but I'll leave any followup changes until after Wednesday.
9 | + 10 | + # We have to tell 'ar' to not run ranlib by itself 11 | + QMAKE_AR += -S 12 | +-- 13 | +2.35.1 14 | +
ee74be5e8d852beebe8775098256544d58ee3c71
The last 3 lines seem do not belong to the patch.
Fixed.
However note that
bitcoin-qtstill isn't being built because of duplicate symbol issues when running our configure checks.
x86_64-apple-darwin-ld: error: duplicate symbol: __Z10lcQpaFontsv
>>> defined in /home/hebasto/GitHub/bitcoin/depends/x86_64-apple-darwin/lib/libQt5ThemeSupport.a(qgenericunixthemes.o)
>>> defined in /home/hebasto/GitHub/bitcoin/depends/x86_64-apple-darwin/lib/libQt5FontDatabaseSupport.a(qfontengine_coretext.o)
Concept ACK
After the PR review club I agree moving from a non-standard toolchain to using clang and lld is preferable now that lld can be used for this purpose.
Bump to https://github.com/llvm/llvm-project/tree/llvmorg-14.0.0?
I will do once binaries are available, currently there is only aarch64.
Rebased and dropped the redundant preprocessing step.
Bump to https://github.com/llvm/llvm-project/tree/llvmorg-14.0.0?
Rebased and done now.
Update ZERO_AR_DATE docs / comments.
lld (and ld64) also respects ZERO_AR_DATE, so I've resolved this TODO by removing the documentation block about cctools and ar.
LLVM 14.0.1 is out. Will switch to using that once binaries are available.
Rebased. Now that 298389e3b51edf561a2b636df0948a232167693a is merged, I've added a commit to use clang-toolchain-14 in the Guix build (which will still fail in this PR). That, and a change to use LLVM 14.0.3 (once the Ubuntu binaries are available) could be split off from here.
<!--9cd9c72976c961c55c7acef8f6ba82cd-->
| File | commit d5d40d59f8d12cf53c5ad1ce9710f3f108cec386<br>(master) | commit 14980b5f6e23d992b26de07f3d63c3f459fb5f6d<br>(master and this pull) |
|---|---|---|
| SHA256SUMS.part | cab0d9d09ea27cfc... |
d456160c8eab62f3... |
| *-aarch64-linux-gnu-debug.tar.gz | 69c2b08f181c1031... |
e9c4cc1132c3b75d... |
| *-aarch64-linux-gnu.tar.gz | 8eef97ef242d9f63... |
a6de3e65007ece5d... |
| *-arm-linux-gnueabihf-debug.tar.gz | ba9ffc1a6d127bda... |
088424c512382caf... |
| *-arm-linux-gnueabihf.tar.gz | b405a357bd56add3... |
817ccc4857767011... |
| *-arm64-apple-darwin-unsigned.dmg | 071f6058647f3422... |
|
| *-arm64-apple-darwin-unsigned.tar.gz | 9ded0dff772f4985... |
|
| *-arm64-apple-darwin.tar.gz | d3b09d43fff7cf71... |
|
| *-powerpc64-linux-gnu-debug.tar.gz | 6807f83db05bd92f... |
8f8708b5548565d7... |
| *-powerpc64-linux-gnu.tar.gz | bcb7c18febb8c7e7... |
759e0279eca4b782... |
| *-powerpc64le-linux-gnu-debug.tar.gz | 9d7a2bde6fea97dc... |
62446c089353add3... |
| *-powerpc64le-linux-gnu.tar.gz | bbdce47e47846a77... |
b088fa6630a62109... |
| *-riscv64-linux-gnu-debug.tar.gz | 505e9e46e0305cdd... |
89611d6bdc8e02ed... |
| *-riscv64-linux-gnu.tar.gz | 5dcf4ba127a19567... |
fbe00cb4f7e78b5e... |
| *-win64-debug.zip | 8df89f22bffe27a1... |
f78b99b9e92b7edb... |
| *-win64-setup-unsigned.exe | 23e7dbf89c825ed5... |
7db42e54a2b69318... |
| *-win64-unsigned.tar.gz | 556700a31e066eb5... |
cfbc1c47bcddb8c3... |
| *-win64.zip | f12b0c953ab0d773... |
94158a5a18fae950... |
| *-x86_64-apple-darwin-unsigned.dmg | 6aa5d41c509e5204... |
|
| *-x86_64-apple-darwin-unsigned.tar.gz | a047685b83801fd8... |
|
| *-x86_64-apple-darwin.tar.gz | 7be4d9ebd6cf3185... |
|
| *-x86_64-linux-gnu-debug.tar.gz | b34579395298c9e3... |
43a78ef875253251... |
| *-x86_64-linux-gnu.tar.gz | 02b9019f43e53043... |
5800879585404fbc... |
| *.tar.gz | 19a6f889b2c5d60f... |
7003bdd4301e049b... |
| guix_build.log | db443c423abd9fc5... |
defd3eb3c30f0de1... |
| guix_build.log.diff | 7f0842e23cb8792a... |
This isn't going to make it for 24.0, so have dropped it from the milestone.
Kicked this along to LLVM 15.x. Note that a Guix build of more than the darwin targets may fail for an unrelated reason. Still need a few changes.
Tested 46d8f32086d89de919036613b8cb437bc71a9286 on Ubuntu 22.04.
The f41493b9023acb6f3c237f6609f34f99d7e52dc1 commit introduced an error on my system:
$ make -C depends HOST=x86_64-apple-darwin boost FORCE_USE_SYSTEM_CLANG=1
...
Preprocessing boost...
Configuring boost...
tar: option requires an argument -- 'f'
Try 'tar --help' or 'tar --usage' for more information.
...
I've rebased this, as well as updated our depends build to use LLVM 16.0.0. Guix doesn't yet have LLVM 16 available, either in master or core-updates, so for now, I've bumped the time-machine further, so that it gives us LLVM 15.0.7 there.
With LLVM 16.0.0 in depends, this can be tested / played around with further. However I'll move this back to draft for now.
- -bind_at_load support.
I explored this today, and it seems this feature is deprecated. It has been replaced by -fixup_chains as of ld64 v512.4. Here's a write-up on the new functionality. For lld (in conflict with what the site above says), the new functionality kicks in when OSX_MIN_VERSION >= 11.0.
- Fix building libbitcoinconsensus.
By this, I believe you mean unsupported lld -r? If so, that should be unnecessary with CMake.
Edit: Core is a beast to test with, but using libsecp256k1 as a test-case:
Playing around with the link options: -Wl,-no_fixup_chains -Wl,-bind-at-load (and their opposites) do as expected as checked with: objdump -t --lazy-bind libsecp256k1.2.dylib. When using -fixup_chains (the new default for >=11.0) the lazy bind table is empty as we'd hope.
I've experimented and implemented the above here: https://github.com/theuni/bitcoin/commits/21778
@fanquake I think we want https://github.com/theuni/bitcoin/commit/a0427fc986294ef81605b4c44b54c3ec9825bf48 regardless, which fixes the libbitcoinconsensus linking issue. tl;dr: It makes lld linking work like ld64 by skipping a busted test. The -r was a red herring as a result of that busted test.
Shall I go ahead and PR that commit separately?
Edit: So, now the only thing stopping us from using vanilla llvm is a minimum version bump, right? So.. I guess it's time for that discussion :)
10.15 has been unsupported for 8 months now...
Shall I go ahead and PR that commit separately? @theuni sgtm. I've got some related compile flag changes in #27493, but I'm going to just combine most of the relevant changes here. If we get the LLD switchover done for 26.x, then we can skip another bump in the interim.
For now, I've rebased this PR on top of all of your other commits above, and reverted back to LLVM 15.0.6 in depends. Also updated the PR description.
@fanquake Do you happen to know what the earliest working clang+lld combo would be? Obviously 15 and 16 work, did 13 or 14 have the required options? Just curious because it'll be good to know what the minimum supported vanilla combo (outside of guix/depends) is as that'll become our new requirement.
did 13 or 14 have the required options?
IIRC I think so. I'l go back and check, so we can establish a minimum required version.
Hmm, Looks like fixup_chains didn't go into lld until v16. So I guess that would be our minimum version.
Which I suppose means that fixup_chains isn't actually being used in this PR. I'll check around in the logs and if I'm right about that I'll work up a test that this PR should fail as-is.
Edit: yep:
checking whether the linker accepts -Wl,-bind_at_load... no checking whether the linker accepts -Wl,-fixup_chains... no
I'll poke around with Lief to see if we can enforce fixup_chains there.
powerpc64-linux-gnu build is failing with:
Backtrace:
In srfi/srfi-1.scm:
586:29 19 (map1 (#<<manifest-entry> name: "python-lief" versio?> ?))
586:17 18 (map1 (#<<manifest-entry> name: "powerpc64-linux-gnu-t?>))
In guix/profiles.scm:
1930:19 17 (_ _)
In guix/packages.scm:
1348:17 16 (supported-package? #<package powerpc64-linux-gnu-tool?> ?)
In guix/memoization.scm:
101:0 15 (_ #<hash-table 7f27a126c4c0 282/443> #<package powerp?> ?)
In guix/packages.scm:
1318:12 14 (_)
In srfi/srfi-1.scm:
460:18 13 (fold #<procedure 7f27a03a2560 at guix/packages.scm:13?> ?)
In guix/packages.scm:
1322:42 12 (_ _ ("x86_64-linux" "i686-linux"))
In guix/memoization.scm:
101:0 11 (_ #<hash-table 7f27a126c4c0 282/443> #<package glibc-?> ?)
In guix/packages.scm:
1318:12 10 (_)
In srfi/srfi-1.scm:
460:18 9 (fold #<procedure 7f27a03a75c0 at guix/packages.scm:13?> ?)
In guix/packages.scm:
1322:42 8 (_ _ ("x86_64-linux" "i686-linux"))
In guix/memoization.scm:
101:0 7 (_ #<hash-table 7f27a126c4c0 282/443> #<package linux-?> ?)
In guix/packages.scm:
1326:37 6 (_)
1588:16 5 (package->bag _ _ _ #:graft? _)
1693:43 4 (thunk)
In guix/build-system/gnu.scm:
187:19 3 (arguments _)
In gnu/packages/cross-base.scm:
389:34 2 (loop (#:phases (modify-phases %standard-phases # ?) ?) #)
In ice-9/boot-9.scm:
1685:16 1 (raise-exception _ #:continuable? _)
1685:16 0 (raise-exception _ #:continuable? _)
ice-9/boot-9.scm:1685:16: In procedure raise-exception:
ERROR:
1. &platform-not-found-error: "powerpc64-linux-gnu"
It's not defined in https://github.com/guix-mirror/guix/blob/7c7853d269fe53271dd35d5bd941d18a2cb55120/guix/platforms/powerpc.scm
powerpc64-linux-gnu build is failing with:
Thanks, thats's already mentioned as a known issue here: #27897, which also does a time-machine bump. You don't need to build for powerpc to test the two macOS build, if you want to test the changes here.
<!--9cd9c72976c961c55c7acef8f6ba82cd-->
| File | commit 35b01e85049219a190ccfdf589e2613942eca215<br>(master) | commit 4ef7273a8b09ad133e49972befab58eea0fb46fc<br>(master and this pull) |
|---|---|---|
| SHA256SUMS.part | 5c0121942679bc92... |
bbb55c09df9b9e57... |
| *-aarch64-linux-gnu-debug.tar.gz | cf1070e429a3fb97... |
6780230976ddd0ba... |
| *-aarch64-linux-gnu.tar.gz | f75080cb433f3bf0... |
80c352fe1262457a... |
| *-arm-linux-gnueabihf-debug.tar.gz | 1ad00ab5e55db130... |
de897117ca5836b9... |
| *-arm-linux-gnueabihf.tar.gz | 3df3363135b83964... |
c1f4c33858d0f291... |
| *-arm64-apple-darwin-unsigned.dmg | 27601baaf7a400f8... |
|
| *-arm64-apple-darwin-unsigned.tar.gz | 31d884fb864ce417... |
|
| *-arm64-apple-darwin.tar.gz | 6225c3a22a6aff33... |
|
| *-powerpc64-linux-gnu-debug.tar.gz | d4041bb8d20abd31... |
|
| *-powerpc64-linux-gnu.tar.gz | f42f44c9db35f78d... |
|
| *-powerpc64le-linux-gnu-debug.tar.gz | a837165c7e70350e... |
|
| *-powerpc64le-linux-gnu.tar.gz | 8f222ed1804d67af... |
|
| *-riscv64-linux-gnu-debug.tar.gz | a3a0c9dd5f528f58... |
624283f0337a636a... |
| *-riscv64-linux-gnu.tar.gz | 3a5b1c8814b05666... |
ba58e117d8d79f2e... |
| *-x86_64-apple-darwin-unsigned.dmg | fb69df8f973e5655... |
|
| *-x86_64-apple-darwin-unsigned.tar.gz | a6e6d7fbe8d16544... |
|
| *-x86_64-apple-darwin.tar.gz | 9079e558d7996b0d... |
|
| *-x86_64-linux-gnu-debug.tar.gz | cc48a0b5c5c02e36... |
8cfec3fcb48a1252... |
| *-x86_64-linux-gnu.tar.gz | 59f8b24614dc85d8... |
4d6981ef4e592e51... |
| *.tar.gz | cd61bb5892c817c8... |
f03c8d18d330009b... |
| guix_build.log | afab83917069f763... |
b8eb92bf056e4a8f... |
| guix_build.log.diff | b842ee3fc68ed95d... |
Rebased past #27999. Now that we require fixup_chains, we also require at least LLVM 16+ (which doesn't yet exist in Guix). Hopefully we'll have the infra to construct it ourselves shortly: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=64100 (which will mean a more recent time-machine bump). https://reviews.llvm.org/D151926 / https://reviews.llvm.org/D151944 has also landed in LLVM (17.x), so we can backport if needed.
In the meantime, I've rebased this, and updated depends to use LLVM 16.0.4. There aren't currently x86_64 binaries available for 16.0.5 or 16.0.6.
Also added a commit to drop explicit -bind_at_load usage from configure for now. Cleaned up the PR description and instructions. Note that Guix build are basically expected to fail at this point. However if anyone would like to test, cross-compilation can be done using depends.
<!--9cd9c72976c961c55c7acef8f6ba82cd-->
| File | commit b66f6dcb26906ca8187c7e54735e21168b8101c7<br>(master) | commit d895d9ebfbe3139354097bc73b39ed81b384e2f1<br>(master and this pull) |
|---|---|---|
| SHA256SUMS.part | 8ff253f8c5589627... |
1b476775bd43e6c9... |
| *-aarch64-linux-gnu-debug.tar.gz | 7cd68d0bae053cdd... |
cea45928dcf73d81... |
| *-aarch64-linux-gnu.tar.gz | 94b8b60e0f6cd2d6... |
2838172ec455ce03... |
| *-arm-linux-gnueabihf-debug.tar.gz | bd02f71eed9a8793... |
c87b93447b60dfad... |
| *-arm-linux-gnueabihf.tar.gz | b95d9a29a1751bb7... |
379cd13fb5ef63ee... |
| *-arm64-apple-darwin-unsigned.tar.gz | c6b3c7b5fa4e16a6... |
|
| *-arm64-apple-darwin-unsigned.zip | 3e49a0778c5ab8b3... |
|
| *-arm64-apple-darwin.tar.gz | 82da8245105429b8... |
|
| *-powerpc64-linux-gnu-debug.tar.gz | a332ebbe44b1e36b... |
033e8b2038281a35... |
| *-powerpc64-linux-gnu.tar.gz | 09918947e6c1771e... |
3110ddc8bf6fe42c... |
| *-powerpc64le-linux-gnu-debug.tar.gz | c8dc2e09467353da... |
a3fe61ee7826a625... |
| *-powerpc64le-linux-gnu.tar.gz | 8220e0b2129331fa... |
969a79f912b9072f... |
| *-riscv64-linux-gnu-debug.tar.gz | b563b0c7802c24ef... |
98512bb2df61089d... |
| *-riscv64-linux-gnu.tar.gz | 3fc221ea395342ce... |
ece688cdc4b404e6... |
| *-x86_64-apple-darwin-unsigned.tar.gz | 145a9c2f182f4e32... |
|
| *-x86_64-apple-darwin-unsigned.zip | 46f00fb4aa1b8de7... |
|
| *-x86_64-apple-darwin.tar.gz | fd17aa9483bd4034... |
|
| *-x86_64-linux-gnu-debug.tar.gz | 6cd4a3d800899f91... |
17a2d28a458e37fb... |
| *-x86_64-linux-gnu.tar.gz | 2151d8a2fd20f522... |
2289a7b4579bde35... |
| *.tar.gz | 7f28c39ebddb885e... |
6585693119f49c68... |
| guix_build.log | 2e3a605ef8fb1c0c... |
f46848c311fe56d2... |
| guix_build.log.diff | c7cbf8813f393c9b... |
0 | @@ -0,0 +1,11 @@ 1 | +--- a/qtbase/mkspecs/features/mac/no_warn_empty_obj_files.prf 2 | ++++ b/qtbase/mkspecs/features/mac/no_warn_empty_obj_files.prf 3 | +@@ -1,7 +1,7 @@ 4 | + # Prevent warnings about object files without any symbols. This is a common 5 | + # thing in Qt as we tend to build files unconditionally, and then use ifdefs 6 | + # to compile out parts that are not relevant. 7 | +-QMAKE_RANLIB += -no_warning_for_no_symbols 8 | ++# QMAKE_RANLIB += -no_warning_for_no_symbols
5dd066d4301342859e124abcd61141fbb8b5a003: can you clarify in the commit message or patch file why we're disabling this? Since the comment suggests it's needed.
IIRC this was because LLVM ranlib didn't support this option, so qt would fail to build.
5 | @@ -6,7 +6,7 @@ $(package)_sha256_hash=d4d46c64622f13d6938cecf989046d9561011bb59e8ee835f8f39825d 6 | $(package)_patches=disable_zlib.patch 7 | 8 | ifeq ($(strip $(FORCE_USE_SYSTEM_CLANG)),) 9 | -$(package)_dependencies=native_clang
e65a429b6a895d183aa2131b2001dfee0ec78240 delete native_clang.mk?
It was, seems it returned in a rebase. Will drop it on the next push.
Guix building df71f448cdaf429f54367ab251e21e628c1903d3 is having issues for me:
Extracting libevent...
/home/guix/depends-sources-cache/libevent-2.1.12-stable.tar.gz: OK
Preprocessing libevent...
Configuring libevent...
checking for a BSD-compatible install... /home/guix/.guix-profile/bin/install -c
checking whether build environment is sane... yes
checking for x86_64-apple-darwin-strip... no
checking for strip... strip
configure: WARNING: using cross tools not prefixed with host triplet
checking for a thread-safe mkdir -p... /home/guix/.guix-profile/bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether make supports nested variables... yes
checking whether make supports nested variables... (cached) yes
checking whether make supports the include directive... yes (GNU style)
checking for x86_64-apple-darwin-gcc... env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH -u OBJC_INCLUDE_PATH -u OBJCPLUS_INCLUDE_PATH -u CPATH -u LIBRARY_PATH /home/guix/.guix-profile/bin/clang --target=x86_64-apple-darwin -mmacosx-version-min=11.0 -B/bitcoin/depends/x86_64-apple-darwin/native/bin -mlinker-version=711 -isysroot/home/guix/SDKs/Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers -iwithsysroot/usr/include -iframeworkwithsysroot/System/Library/Frameworks
checking whether the C compiler works... no
configure: error: in `/bitcoin/depends/work/build/x86_64-apple-darwin/libevent/2.1.12-stable-ab81f19d3b8':
configure: error: C compiler cannot create executables
See `config.log' for more details
make: *** [funcs.mk:292: /bitcoin/depends/x86_64-apple-darwin/.libevent_stamp_configured] Error 77
make: Leaving directory '/bitcoin/depends'
Can add more details...
Can add more details...
I'd suggest reviewing the base PRs instead, for now (pretty sure this is just -fuse-ld usage that needs tidying up).
25 | + 26 | +# Make-only lowercase function 27 | +lc = $(subst A,a,$(subst B,b,$(subst C,c,$(subst D,d,$(subst E,e,$(subst F,f,$(subst G,g,$(subst H,h,$(subst I,i,$(subst J,j,$(subst K,k,$(subst L,l,$(subst M,m,$(subst N,n,$(subst O,o,$(subst P,p,$(subst Q,q,$(subst R,r,$(subst S,s,$(subst T,t,$(subst U,u,$(subst V,v,$(subst W,w,$(subst X,x,$(subst Y,y,$(subst Z,z,$1)))))))))))))))))))))))))) 28 | + 29 | +# For well-known tools provided by LLVM, make sure that their well-known 30 | +# variable is set to the full path of the tool, just like how AC_PATH_{TOO,PROG}
# variable is set to the full path of the tool, just like how AC_PATH_{TOOL,PROG}
Rebased after #28880. Cleaned up the commits a bit. Doesn't work yet, because Qt doesn't build..
Also rethinking the best approach here a bit, as we've now essentially got to accomodate 3 different builds for macOS:
-fuse-ld=lld)cc @theuni @TheCharlatan.
55 | @@ -56,29 +56,14 @@ The `sha256sum` should be `c0c2e7bb92c1fee0c4e9f3a485e4530786732d6c6dd9e9f418c28 56 | 57 | ## Deterministic macOS App Notes 58 | 59 | -macOS Applications are created in Linux by combining a recent `clang` and the Apple 60 | -`binutils` (`ld`, `ar`, etc). 61 | +macOS Applications are created in Linux by combining a recent LLVM (`clang`, 62 | +`lld` + binutils)
nit: As the word 'combining' has only one object, rather than two as it was before, it seems reasonable to drop it altogether.
Given this doesn't yet work, and we might be reithinking the approach (which might render this text irrelevant, I'll just leave stuff like this for now.
Building for mac, in Guix, using Guix's Clang + our downloaded lld + tools??
- Or shift further into using all Guix linker + tools, or, try drop Guix Clang?
Would you say that (temporarily) using Apple's Clang instead of Guix would still make this PR an overall improvement for macOS reproducibility? If so, and if makes things easier, that could make sense.
<!--9cd9c72976c961c55c7acef8f6ba82cd-->
| File | commit 4b1196a9855dcd188a24f393aa2fa21e2d61f061<br>(master) | commit 7629d0b986ef89f7b1c782dda580c88c63e458fc<br>(master and this pull) |
|---|---|---|
| SHA256SUMS.part | 7aefd803a584a152... |
d7154abd4a887dac... |
| *-aarch64-linux-gnu-debug.tar.gz | 735f38fb37b239f8... |
735f354db2278d88... |
| *-aarch64-linux-gnu.tar.gz | 83a257c74e184b96... |
96acc429073b7505... |
| *-arm-linux-gnueabihf-debug.tar.gz | 513acf435b18fab2... |
6251c36c50993a4c... |
| *-arm-linux-gnueabihf.tar.gz | 581f911fcca5ae02... |
231c775e30d73af2... |
| *-arm64-apple-darwin-unsigned.tar.gz | 7a3f2b4e01f27896... |
|
| *-arm64-apple-darwin-unsigned.zip | dff45b014236e990... |
|
| *-arm64-apple-darwin.tar.gz | 0d9696b7bd76b36f... |
|
| *-powerpc64-linux-gnu-debug.tar.gz | dfe6cfdcd6ad3c6f... |
f1aa680bbb376d25... |
| *-powerpc64-linux-gnu.tar.gz | 54c013201daad1ff... |
e710f74b0735f9dc... |
| *-powerpc64le-linux-gnu-debug.tar.gz | 8e944b002273b678... |
c393286c41984bc8... |
| *-powerpc64le-linux-gnu.tar.gz | 1ba8199984d7c43a... |
e0abc78b6acc46ea... |
| *-riscv64-linux-gnu-debug.tar.gz | e9abe48aeb7acc68... |
ab09fdd1e51bbdb2... |
| *-riscv64-linux-gnu.tar.gz | f4d1484dec65b967... |
90cb881fa669ce61... |
| *-x86_64-apple-darwin-unsigned.tar.gz | 915650aa35e6e322... |
|
| *-x86_64-apple-darwin-unsigned.zip | 6a6139cb415de743... |
|
| *-x86_64-apple-darwin.tar.gz | c479d099d1df9a85... |
|
| *-x86_64-linux-gnu-debug.tar.gz | 9e27161179f18a4a... |
09dcf80be0c4fadd... |
| *-x86_64-linux-gnu.tar.gz | f69632ca3dc98896... |
6eebaff5efc73ab4... |
| *.tar.gz | c04997c9f9e51d80... |
b80555965cab86b5... |
| guix_build.log | cd3620fc987c1754... |
809045aa4d2ba9dc... |
| guix_build.log.diff | ab07ea234882a7e5... |
Building for mac, on Linux, using our downloaded LLVM (Clang + lld + tools)
Building for mac, in Guix, using Guix's Clang + our downloaded lld + tools??
- Or shift further into using all Guix linker + tools, or, try drop Guix Clang?
I think the benefit of using guix (over downloading a random binary blob from someone else's computer) is that cross compilation to macOS works on more architectures than the uploads of the llvm binaries. (For example riscv64)
So simply requiring guix to do a macOS depends build (and nuking clang from depends, or keeping it as a fallback, if needed) seems preferable?
and nuking clang from depends,
After discussion today with @theuni @hebasto @TheCharlatan, I'm actually about to open a PR to do exactly this.
Pushed up a few more improvements.
Somewhat annoyingly, some distros (Ubuntu) only ship llvm-libtool-darwin with a version suffix, i.e llvm-libtool-darwin-17, however many others (Fedora, Alpine etc) do not do this. I think we should just set darwin_LIBTOOL=llvm-libtool-darwin as a best effort, and I've added a note to the depends readme, that if anyone sees issues, they should set LIBTOOL=llvm-libtool-darwin-version when calling make.
The CI failure here is a bit odd, because it only happens for ZeroMQ, and only when using what looks like clang-14? This doesn't happen when using newer Clang, or when doing a Guix build. The actual error is:
configure:20428: checking whether the C++ compiler works
configure:20445: env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH -u OBJC_INCLUDE_PATH -u OBJCPLUS_INCLUDE_PATH -u CPATH -u LIBRARY_PATH /usr/bin/clang++ --target=arm64-apple-darwin -mmacosx-version-min=11.0 -mlinker-version=711 -isysroot/bitcoin/depends/SDKs/Xcode-15.0-15A240d-extracted-SDK-with-libcxx-headers -nostdlibinc -iwithsysroot/usr/include/c++/v1 -iwithsysroot/usr/include -iframeworkwithsysroot/System/Library/Frameworks -std=gnu++11 -o conftest -pipe -std=c++20 -O2 -I/bitcoin/depends/arm64-apple-darwin/include -Wl,-platform_version,macos,11.0,14.0 -fuse-ld=lld -L/bitcoin/depends/arm64-apple-darwin/lib conftest.cpp >&5
ld64.lld: error: library not found for -lstdc++
clang: error: linker command failed with exit code 1 (use -v to see invocation)
configure:20445: $? = 1
configure: failed program was:
| /* confdefs.h */
| #define PACKAGE_NAME "zeromq"
| #define PACKAGE_TARNAME "zeromq"
| #define PACKAGE_VERSION "4.3.5"
| #define PACKAGE_STRING "zeromq 4.3.5"
| #define PACKAGE_BUGREPORT "zeromq-dev@lists.zeromq.org"
| #define PACKAGE_URL ""
| #define PACKAGE "zeromq"
| #define VERSION "4.3.5"
| #define HAVE_STDIO_H 1
| #define HAVE_STDLIB_H 1
| #define HAVE_STRING_H 1
| #define HAVE_INTTYPES_H 1
| #define HAVE_STDINT_H 1
| #define HAVE_STRINGS_H 1
| #define HAVE_SYS_STAT_H 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_UNISTD_H 1
| #define STDC_HEADERS 1
| #define HAVE_DLFCN_H 1
| #define LT_OBJDIR ".libs/"
| #define HAVE_CXX11 1
| /* end confdefs.h. */
|
| int
| main (void)
| {
|
| ;
| return 0;
| }
configure:20455: result: no
configure:20459: error: Unable to find a working C++ compiler
It's failing to find -lstdc++ while running the AX_CXX_COMPILE_STDCXX_11 macro (zeromq also ships an ancient version of AX_CXX_COMPILE_STDCXX), but it shouldn't be trying to use that in any case. We want libc++.
The CI failure here is a bit odd, because it only happens for ZeroMQ, and only when using what looks like clang-14?
I think the solution to this is just to keep our current Clang version requirement for macOS cross-compilation. Currently, we vendor our own Clang (17) and use 17 in Guix. Switching to using system Clang doesn't mean we now need to support clang-13 + when building for macOS, because we never did previously, and no-one building Core could have been using a version other than the only one we supported (17).
So, when switching to system Clang, we retain the Clang 17 requirement (for macOS). The CI should also be using 17, because it should match what we are doing in Guix. So I've now switched it to a newer version of Ubuntu (24.04), which ships clang-17 by default.
In regards to the ZeroMQ failure, my suspicion is that the failure is realted to -nostdlibinc and earlier versions of Clang.
8 | @@ -9,9 +9,10 @@ export LC_ALL=C.UTF-8 9 | export SDK_URL=${SDK_URL:-https://bitcoincore.org/depends-sources/sdks} 10 | 11 | export CONTAINER_NAME=ci_macos_cross 12 | -export CI_IMAGE_NAME_TAG="docker.io/ubuntu:22.04" 13 | +export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04" 14 | export HOST=x86_64-apple-darwin 15 | -export PACKAGES="cmake zip" 16 | +export PACKAGES="clang cmake lld llvm zip" 17 | +export LIBTOOL=llvm-libtool-darwin-14
Should be -17?
Thanks, fixed up.
Given the above, we can also avoid having to repatch Qt, to work around bugs there. Dropped that commit.
8 | @@ -9,9 +9,10 @@ export LC_ALL=C.UTF-8 9 | export SDK_URL=${SDK_URL:-https://bitcoincore.org/depends-sources/sdks} 10 | 11 | export CONTAINER_NAME=ci_macos_cross 12 | -export CI_IMAGE_NAME_TAG="docker.io/ubuntu:22.04" 13 | +export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04" 14 | export HOST=x86_64-apple-darwin 15 | -export PACKAGES="cmake zip" 16 | +export PACKAGES="clang cmake lld llvm zip" 17 | +export LIBTOOL=llvm-libtool-darwin-17
This will break in a few months, when clang will become an alias for clang-18
Sure. I guess at that point we'll have to change it. Not sure what else to do given this is what Ubuntu ships. I assume we'll have to make other changes at the same time, if the CI is changing compilers etc out from under us?
I guess we can also just explictly install clang-17 and llvm-17 here, and then not have to worry about things, until those packages no-longer exist.
However that would also require more changes, (not clear we want to hardcode -17 further ((inside depends)), and make our build less generic, so not sure.
More changes as in being able to handle setting CC to e.g. clang-17 for darwin depends? That seems worthwhile, no?
More changes as in being able to handle setting CC to e.g. clang-17 for darwin depends?
That should already work ok, I mean, hardcoding things like command -v clang-17 in depends. If the preference is to install the *-17 toolchain, and pass CC and CXX explicitly, we can do that. We'd have to do that with everything, AR, RANLIB, LIBTOOL, NM etc.
Sure. I guess at that point we'll have to change it.
Well, if it is going to be changed, it may be better to do the change now. Otherwise it just seems like extra steps to reach the same point eventually?
Well, if it is going to be changed, it may be better to do the change now.
Change it to what though? The problem is that Ubuntu only ships this binary with a version suffix. We can't use something generic, and we want to use version 17.
Change it to what though?
apt install clang-17, like in the tidy task, it is also possible to export a variable to set CROSS_LLVM_V="17" and then use that variable, where needed.
Ok, done as I suggested above.
Moved to explicitly installing *-17. Added the missing darwin_STRIP=llvm-strip .
Re libtool: As far as I can see, it's only used for miniupnpc/libnatpnp?
If that's the case, I don't think it's worth the trouble of having users work around it.
I'd suggest we either:
libtool in the Makefiles and use ar, then drop our libtool machinery entirely.libtool is unused.I have a branch with commits to do the latter as part of a larger CMake switch, but maybe now is a good time to take those two? (If so, ignore the native_cmake part, that was just to get myself bootstrapped.)
Edit: If there's interest in the above I can PR it separately.
Edit: If there's interest in the above I can PR it separately.
Sure, I can rebase on top of that PR, if you want to open it.
Would still like to see them PR'd separately, but I cherry-picked the two relevant commits, dropped native_cmake, and have dropped anything libtool related here.
The remaining issue here is with make -C depends CC= CXX= usage. If we override, we lose the c(xx) flags which are currently embedded into darwin_C(XX), which means things don't compile. This is why this PR works fine, if you just invoke make -C depends HOST=arm64-apple-darwin, with clang installed, but if you make -C depends HOST=arm64-apple-darwin CC=clang-17 CXX=clang++-17, like we want to do in the CI, things don't quite work because we loose flags, like --target, and clang things it's compiling for Linux etc. So we'll need to move (some) flags into darwin_C(XX)FLAGS.
If you Guix build this branch now, everything will compile fine, but it will fail during the test-security check stage, that issue should also be easily resolved.
Would still like to see them PR'd separately, but I cherry-picked the two relevant commits, dropped
native_cmake, and have dropped anything libtool related here.
It's been quite a while since I worked on those, I don't remember if they were completely merge-ready (I suspect windows cross might be broken for ex.). Playing with them locally now.
Would still like to see them PR'd separately, but I cherry-picked the two relevant commits, dropped
native_cmake, and have dropped anything libtool related here.It's been quite a while since I worked on those, I don't remember if they were completely merge-ready (I suspect windows cross might be broken for ex.). Playing with them locally now.
Here's a cleaned up version: https://github.com/theuni/bitcoin/commits/depends-no-libtool/ They needed an update after 63c0c4ff10b2f6ed8510ef372a5b1f6a6494b179.
Also adds a commit which actually removes the libtool machinery.
Did quick tests for mac and mingw locally to make sure that proper flags were applied, looks ok to me.
~Blah, it looks like the win32 filename is borked with cmake: liblibminiupnpc.a~
Want to punt the libtool removal to a follow-up PR to avoid slowing this one down?
Edit: I grabbed the upstream fix: https://github.com/miniupnp/miniupnp/pull/604
Updated my branch. Up to you if you want to do this here or not.
This is why this PR works fine, if you just invoke make -C depends HOST=arm64-apple-darwin, with clang installed, but if you make -C depends HOST=arm64-apple-darwin CC=clang-17 CXX=clang++-17, like we want to do in the CI
If picking the clang version via depends is not a use case to support outside the CI, what about aliasing clang=clang-17 in the CI container? Obviously fixing depends would be cleaner, but if it is only used by CI, then it may not be needed.
The only requirement for the CI is that the version is pinned (or that this pull request is put on hold until Ubuntu bumped to clang-18, in which case it will remain pinned by itself)
Want to punt the libtool removal to a follow-up PR to avoid slowing this one down?
Looks like the cmake changes will require some additional CI changes at least. I think we can still open an additional PR, with upnpc and natpmp, and get that merged. Seems cleanest to just nuke libtool here, and avoid interim workarounds for Ubuntus binarys etc. I'll pull your new commits in here in any case.
If picking the clang version via depends is not a use case to support outside the CI,
We do want to support that, but only with clang-17+. The issue is the flags being embedded into c/cxx, which is an artifact of previous problems. We can move the flags out, and this will be solved.
Rebased on top of adding CMake into all CIs, the newer upnpc / libnatmp / dropping libtool commits, and added a new commit to deduplicate usage of -mmaxosx-version-min.
Pushed up one WIP commit. This almost works how we want it too:
make -C depends/ HOST=arm64-apple-darwin -j17. Tested on x86_64 Ubuntu with Ubuntu clang version 17.0.6 (3).CC & CXX, i.e make -C depends/ HOST=arm64-apple-darwin CC=clang-17 CXX=clang++-17. See the CI (which fails during make deploy due to no otool), also tested on aarch64 Fedora with clang version 17.0.6 (Fedora 17.0.6-4.fc40).test-security-check because they invoke ld: CXXLD bitcoin-cli
ld64.lld: warning: Option `-bind_at_load' is not yet implemented. Stay tuned...
AR minisketch/libminisketch.a
ld64.lld: warning: Option `-bind_at_load' is not yet implemented. Stay tuned...
ld64.lld: warning: Option `-bind_at_load' is not yet implemented. Stay tuned...
CXXLD univalue/test/unitester
ld64.lld: warning: Option `-bind_at_load' is not yet implemented. Stay tuned...
ld64.lld: warning: Option `-bind_at_load' is not yet implemented. Stay tuned...
ld64.lld: warning: Option `-bind_at_load' is not yet implemented. Stay tuned...
CXXLD univalue/test/object
ld64.lld: warning: Option `-bind_at_load' is not yet implemented. Stay tuned...
AR libtest_util.a
CXXLD test/test_bitcoin
ld64.lld: warning: Option `-bind_at_load' is not yet implemented. Stay tuned...
make[2]: Leaving directory '/distsrc-base/distsrc-cb758c13eb6c-arm64-apple-darwin/src'
make[1]: Leaving directory '/distsrc-base/distsrc-cb758c13eb6c-arm64-apple-darwin/src'
Making all in doc/man
make[1]: Entering directory '/distsrc-base/distsrc-cb758c13eb6c-arm64-apple-darwin/doc/man'
make[1]: Nothing to be done for 'all'.
make[1]: Leaving directory '/distsrc-base/distsrc-cb758c13eb6c-arm64-apple-darwin/doc/man'
make[1]: Entering directory '/distsrc-base/distsrc-cb758c13eb6c-arm64-apple-darwin'
make[1]: Nothing to be done for 'all-am'.
make[1]: Leaving directory '/distsrc-base/distsrc-cb758c13eb6c-arm64-apple-darwin'
ld: unrecognised emulation mode: acosx_version_min
Supported emulations: elf_x86_64 elf32_x86_64 elf_i386 elf_iamcu elf_l1om elf_k1om
clang: error: linker command failed with exit code 1 (use -v to see invocation)
E
======================================================================
ERROR: test_MACHO (__main__.TestSecurityChecks)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/distsrc-base/distsrc-cb758c13eb6c-arm64-apple-darwin/./contrib/devtools/test-security-check.py", line 118, in test_MACHO
arch = get_arch(cc, source, executable)
File "/distsrc-base/distsrc-cb758c13eb6c-arm64-apple-darwin/./contrib/devtools/test-security-check.py", line 45, in get_arch
subprocess.run([*cc, source, '-o', executable], check=True)
File "/gnu/store/r4ylp5184rybw9s3lpg49hb27fwgk03i-python-minimal-3.10.7/lib/python3.10/subprocess.py", line 524, in run
raise CalledProcessError(retcode, process.args,
subprocess.CalledProcessError: Command '['/root/.guix-profile/bin/clang', '--target=arm64-apple-darwin', '-isysroot/root/SDKs/Xcode-15.0-15A240d-extracted-SDK-with-libcxx-headers', '-nostdlibinc', '-iwithsysroot/usr/include/c++/v1', '-iwithsysroot/usr/include', '-iframeworkwithsysroot/System/Library/Frameworks', 'test1.c', '-o', 'test1']' returned non-zero exit status 1.
----------------------------------------------------------------------
Ran 1 test in 0.117s
FAILED (errors=1)
make: *** [Makefile:1417: test-security-check] Error 1
Linking of all our bins happens with lld, and this shouldn't happen given lld-as-ld-wrapper, following up.
Added a change to fix the make deploy CI failure. It involves switching from otool, to llvm-objdump, which for our needs (listing shared lib deps) is a drop-in replacement with the right flags (--macho --dylibs-used). We could have used llvm-otool, but we'd have the same problem that we would have had with llvm-libtool, which is that some distros (Ubuntu) only ship this binary with a version-suffix, which makes it annoying to find/use. Using llvm-objdump avoids this issue, and it's nicer to move to a less apple-specific tool.
Squashed down the changes, and did some Guix cleanup.
We can entirely remove the GCC toolchain from the macOS build now. Apart from removing unused deps,
my other reason to do this was to make sure that ld wasn't even in the build environment, so couldn't be getting used over lld.
However this has come with a new issue. Qt now fails to build, because it's trying to build qmake with g++,
which no-longer exists. i.e
Configuring qt...
Creating qmake...
make[1]: Entering directory '/bitcoin/depends/work/build/arm64-apple-darwin/qt/5.15.11-f4932583bde/qtbase/qmake'
make[1]: g++: No such file or directory
make[1]: *** [Makefile:250: main.o] Error 127
This would seem to be a bug in any case, because if we are using a clang toolchain, there shouldn't be an assumption that GCC is installed. So we need to make it use clang++ instead.
<!--9cd9c72976c961c55c7acef8f6ba82cd-->
| File | commit 4de84557d6d1f53255ab19f27c8b6ea0a712934a<br>(master) | commit 82d02681d724f0e32f8a91debe6ddff72e2f8de0<br>(master and this pull) |
|---|---|---|
| SHA256SUMS.part | a9a1a6f2a127614b... |
510283c0f8edf5f5... |
| *-aarch64-linux-gnu-debug.tar.gz | 49fb728dcfc5eeeb... |
28c224b95825d50f... |
| *-aarch64-linux-gnu.tar.gz | 76ae34c6ec4b08e4... |
050fadd43a917f48... |
| *-arm-linux-gnueabihf-debug.tar.gz | 3e96a08bdc6e5a2c... |
0d957b335b076eba... |
| *-arm-linux-gnueabihf.tar.gz | e4b94fefda7bd12a... |
0279e8f73a3874b3... |
| *-arm64-apple-darwin-unsigned.tar.gz | 8d02e5e5227cb241... |
|
| *-arm64-apple-darwin-unsigned.zip | 7c7dac9c1989a763... |
|
| *-arm64-apple-darwin.tar.gz | f5aef653cbfaf75f... |
|
| *-powerpc64-linux-gnu-debug.tar.gz | 9c16527c1568ac56... |
fbe35bfb28afa0a6... |
| *-powerpc64-linux-gnu.tar.gz | 99de573c9eb7b8b5... |
7ca195189ddab5ee... |
| *-powerpc64le-linux-gnu-debug.tar.gz | 8272ff86150256bc... |
7db89052e33786b0... |
| *-powerpc64le-linux-gnu.tar.gz | a7c33792b1fd3e90... |
224823be4363e870... |
| *-riscv64-linux-gnu-debug.tar.gz | 5506dfa3ef36e7cf... |
7c59b9c545591758... |
| *-riscv64-linux-gnu.tar.gz | 659865010b8585bb... |
e2da1317d562195c... |
| *-x86_64-apple-darwin-unsigned.tar.gz | 94333e9a7fffa48a... |
|
| *-x86_64-apple-darwin-unsigned.zip | b5895368f40e69db... |
|
| *-x86_64-apple-darwin.tar.gz | 1fd0108302ec3860... |
|
| *-x86_64-linux-gnu-debug.tar.gz | e9ca2bfd0348c674... |
28b4f9908e3b5ead... |
| *-x86_64-linux-gnu.tar.gz | 7dd646df2d92b82d... |
8cbe0fcc0d31f287... |
| *.tar.gz | 8617649a70643eae... |
ab09732325ce83dc... |
| guix_build.log | 4ef53cb390b39d4f... |
073d35ac75364eff... |
| guix_build.log.diff | 9f3a2f81143c67f1... |
5 | @@ -6,48 +6,14 @@ LD64_VERSION=711 6 | 7 | OSX_SDK=$(SDK_PATH)/Xcode-$(XCODE_VERSION)-$(XCODE_BUILD_ID)-extracted-SDK-with-libcxx-headers 8 | 9 | -darwin_native_binutils=native_cctools 10 | +CC = clang 11 | +CXX = clang++
Why is this overriding CC and CXX here (and below)? Seems like this causes the current CI failure, or at least calling this darwin_CC and darwin_CXX allows me to properly override everything with AR=llvm-ar-17 OBJDUMP=llvm-objdump-17 RANLIB=llvm-ranlib-17 STRIP=llvm-strip-17 CC=clang-17 CXX=clang++-17 make HOST=arm64-apple-darwin -j 30 and complete a depends build on my machine.
We have to override below, otherwise a build where the user sets CC and CCX won't work, because there will be no target or SDK flags, and all configure checks / compilation will fail.
Right, what I'm suggesting is keeping the override lines and:
diff --git a/depends/hosts/darwin.mk b/depends/hosts/darwin.mk
index 9e201eb2bc..d31ac398a4 100644
--- a/depends/hosts/darwin.mk
+++ b/depends/hosts/darwin.mk
@@ -9,2 +9,2 @@ OSX_SDK=$(SDK_PATH)/Xcode-$(XCODE_VERSION)-$(XCODE_BUILD_ID)-extracted-SDK-with-
-CC = clang
-CXX = clang++
+darwin_CC = clang
+darwin_CXX = clang++
@@ -46,0 +47,2 @@ override CXX += $(host_and_SDK)
+override darwin_CC += $(host_and_SDK)
+override darwin_CXX += $(host_and_SDK)
<!--cf906140f33d8803c4a75a2196329ecb-->
🐙 This pull request conflicts with the target branch and needs rebase.
Redone this to be less convoluted. No-longer dropping our native LLVM Clang in here; just switching to LLD, dropping cctools & libtapi. Will do Clang in a followup, it gets too messy otherwise. Currently based on #29739 and #30074. Can split the other cctools changes if wanted, but they are pretty simple. The qrencode AR change likely needs to be applied globally in depends.
7 | @@ -8,7 +8,7 @@ $(package)_patches=cmake_fixups.patch 8 | define $(package)_set_vars 9 | $(package)_config_opts := -DWITH_TOOLS=NO -DWITH_TESTS=NO -DGPROF=OFF -DCOVERAGE=OFF 10 | $(package)_config_opts += -DCMAKE_DISABLE_FIND_PACKAGE_PNG=TRUE -DWITHOUT_PNG=ON 11 | -$(package)_config_opts += -DCMAKE_DISABLE_FIND_PACKAGE_ICONV=TRUE 12 | +$(package)_config_opts += -DCMAKE_DISABLE_FIND_PACKAGE_ICONV=TRUE -DCMAKE_AR=$($(package)_ar)
Seems this is a bugfix regardless?
<!--9cd9c72976c961c55c7acef8f6ba82cd-->
| File | commit ceb1e078f8c0ae58ff72748b039184a205efe337<br>(master) | commit cb29a9c7e3f7ee79a309a164ab5cf9f99513f532<br>(master and this pull) |
|---|---|---|
| SHA256SUMS.part | 0d3f2df6d0d82d16... |
|
| *-aarch64-linux-gnu-debug.tar.gz | 6cabb80fb73134f2... |
|
| *-aarch64-linux-gnu.tar.gz | 2daed9464982e987... |
|
| *-arm-linux-gnueabihf-debug.tar.gz | 2bc7c3b446a72adb... |
|
| *-arm-linux-gnueabihf.tar.gz | a3aea09c67eb4e75... |
|
| *-arm64-apple-darwin-unsigned.tar.gz | 38e1f3be896f6dba... |
|
| *-arm64-apple-darwin-unsigned.zip | 83099989d2c8cd75... |
|
| *-arm64-apple-darwin.tar.gz | 9b1115b3e6f12d94... |
|
| *-powerpc64-linux-gnu-debug.tar.gz | fdba5df1bb60516b... |
|
| *-powerpc64-linux-gnu.tar.gz | 3025d8c8e05256fc... |
|
| *-riscv64-linux-gnu-debug.tar.gz | 7e663ade407ca923... |
|
| *-riscv64-linux-gnu.tar.gz | 4e6884787e8e505a... |
|
| *-x86_64-apple-darwin-unsigned.tar.gz | a56351782c789ed6... |
|
| *-x86_64-apple-darwin-unsigned.zip | c171b912a9494622... |
|
| *-x86_64-apple-darwin.tar.gz | f7f4284984349370... |
|
| *-x86_64-linux-gnu-debug.tar.gz | fe60527ac92b9dad... |
|
| *-x86_64-linux-gnu.tar.gz | eea0259e2f294eaa... |
|
| *.tar.gz | 2ffc52da14b707a6... |
|
| guix_build.log | 3877dc10bfbce9b7... |
7bf032c9e397de69... |
| guix_build.log.diff | 5f6f130d9146cf04... |
Darwin Guix build (aarch64):
1de4299604e1711c90134a94a7ba6bc2685cc43e4acb283a7b3689afba883205 guix-build-c5f2df00a26c/output/arm64-apple-darwin/SHA256SUMS.part
7dcb77afb8dfa36c39be686827bec06bd39d197faed179b6e17d62492567ce9a guix-build-c5f2df00a26c/output/arm64-apple-darwin/bitcoin-c5f2df00a26c-arm64-apple-darwin-unsigned.tar.gz
2f2bcf41e7b1f7ac28258e6db4600b0230db515f9549dae1c714948c9986c433 guix-build-c5f2df00a26c/output/arm64-apple-darwin/bitcoin-c5f2df00a26c-arm64-apple-darwin-unsigned.zip
93d42c4cc8c01f882bba24c72823974347b1baed77f4f89a48869dbbcd07f236 guix-build-c5f2df00a26c/output/arm64-apple-darwin/bitcoin-c5f2df00a26c-arm64-apple-darwin.tar.gz
fc3c07f5d43ea8527c9a708bbd58075bb390434c52f7a628208ca0f98dd23308 guix-build-c5f2df00a26c/output/dist-archive/bitcoin-c5f2df00a26c.tar.gz
4e038157c4941ea9d880e034b31ae235ab324fe68de200a62e74098b6e91a096 guix-build-c5f2df00a26c/output/x86_64-apple-darwin/SHA256SUMS.part
6c1e094668b084be9af4069328750c42a330890c90632af485be152426e6094f guix-build-c5f2df00a26c/output/x86_64-apple-darwin/bitcoin-c5f2df00a26c-x86_64-apple-darwin-unsigned.tar.gz
ce59288aee5ee1bb5adac2c3bca5ed72289a9ac15ea2f722a58c18475336b9fc guix-build-c5f2df00a26c/output/x86_64-apple-darwin/bitcoin-c5f2df00a26c-x86_64-apple-darwin-unsigned.zip
76aec809181c6097e6a07de9f0508df14432c7982cf8a553c3751a2ae34d7b14 guix-build-c5f2df00a26c/output/x86_64-apple-darwin/bitcoin-c5f2df00a26c-x86_64-apple-darwin.tar.gz
<!--9cd9c72976c961c55c7acef8f6ba82cd-->
| File | commit 98dd4e712efaa2b77cb168426756879c6405c3f4<br>(master) | commit c07aca77f8e17d7cdc65c744a74d6f49df45f537<br>(master and this pull) |
|---|---|---|
| SHA256SUMS.part | f0882a75d41d55b7... |
3baadae5f3ae0473... |
| *-aarch64-linux-gnu-debug.tar.gz | 09d7a2fa8acc6b0c... |
43f73bad1ef592d6... |
| *-aarch64-linux-gnu.tar.gz | c5f3f036d68133af... |
064676014bc79736... |
| *-arm-linux-gnueabihf-debug.tar.gz | af0eb13e7208138d... |
31dbbd7265d98241... |
| *-arm-linux-gnueabihf.tar.gz | ea79caad5ea6bea3... |
3cfaac5fc2da375a... |
| *-arm64-apple-darwin-unsigned.tar.gz | 323bad7d7830e7a7... |
a491be2d19b2d5e3... |
| *-arm64-apple-darwin-unsigned.zip | 134c5878f0e5ad14... |
c06594af6183241e... |
| *-arm64-apple-darwin.tar.gz | b24da889ec671c09... |
8ef042a74ab7e586... |
| *-powerpc64-linux-gnu-debug.tar.gz | ad5b3947dafad457... |
ee5329f54b12a316... |
| *-powerpc64-linux-gnu.tar.gz | bc9b83d21ba28f85... |
148cb530214fe976... |
| *-riscv64-linux-gnu-debug.tar.gz | d57cb4fc4adc8b09... |
f47131f997d24f63... |
| *-riscv64-linux-gnu.tar.gz | 067b56b3906c3e3c... |
6d4cff3ea683a3e4... |
| *-x86_64-apple-darwin-unsigned.tar.gz | 868db4ba494b3969... |
9941d5493af8a4cd... |
| *-x86_64-apple-darwin-unsigned.zip | d68c44f80125d192... |
27a918c940552c3f... |
| *-x86_64-apple-darwin.tar.gz | 45e48ceebf0b1eea... |
7656222dcad19088... |
| *-x86_64-linux-gnu-debug.tar.gz | 31575780bc6836fc... |
5ed74fbbd220a312... |
| *-x86_64-linux-gnu.tar.gz | 6c42e12b7d5f6cae... |
da7ef4915fd34954... |
| *.tar.gz | 60e42b8267a673c8... |
d5243bfbffad995e... |
| guix_build.log | 73ff248e0462f67f... |
9fc076039d9a9d6e... |
| guix_build.log.diff | 032c9cda0dcb6453... |
103 | @@ -104,6 +104,7 @@ darwin_LDFLAGS=-Wl,-platform_version,macos,$(OSX_MIN_VERSION),$(OSX_SDK_VERSION) 104 | ifneq ($(build_os),darwin) 105 | darwin_CFLAGS += -mlinker-version=$(LD64_VERSION) 106 | darwin_CXXFLAGS += -mlinker-version=$(LD64_VERSION) 107 | +darwin_LDFLAGS += --ld-path=$(build_prefix)/bin/$(host)-ld
(the existing) -B isn't sufficient here?
I think you're right. Might have added this as belt-and-suspenders, but have checked again with non-Guix builds, and I still see the correct lld used, even on systems with other llds installed & similar.
Guix build (aarch64):
cf99b6597c64c4d0cd75176d261a53f24779e8c3dbe9e891d9d166ae9d00d182 guix-build-f58a8678957e/output/aarch64-linux-gnu/SHA256SUMS.part
922e38e2b1a091f20caa014600936689fb9f14bf56fbd80e4c836c518897ff1f guix-build-f58a8678957e/output/aarch64-linux-gnu/bitcoin-f58a8678957e-aarch64-linux-gnu-debug.tar.gz
256c68e14a905aa6933a2dc83cad636a14ee99ac4661a287e7817efe421965ab guix-build-f58a8678957e/output/aarch64-linux-gnu/bitcoin-f58a8678957e-aarch64-linux-gnu.tar.gz
50eafd4c679cab81c40ed02b1ad4aafb53f8ccf40c497e084596a078977221ed guix-build-f58a8678957e/output/arm-linux-gnueabihf/SHA256SUMS.part
bb89cc308567954302710c809b09992befbbf589c2fa3c33be4b575ad5c619d5 guix-build-f58a8678957e/output/arm-linux-gnueabihf/bitcoin-f58a8678957e-arm-linux-gnueabihf-debug.tar.gz
a83ebe295c39f7581b0d12f5ef58059a54ef0950673a3d0444a73983f83f2468 guix-build-f58a8678957e/output/arm-linux-gnueabihf/bitcoin-f58a8678957e-arm-linux-gnueabihf.tar.gz
7db661a4ecabd812a1630b25062f5cfda15564e8ddbe81c8f5aee7e1d0c670c6 guix-build-f58a8678957e/output/arm64-apple-darwin/SHA256SUMS.part
dc4e3673d1aedc94e6e59aa838508dbfcb3a0b1e50af48f94ac3ed691871acf8 guix-build-f58a8678957e/output/arm64-apple-darwin/bitcoin-f58a8678957e-arm64-apple-darwin-unsigned.tar.gz
0899c00ebeac5709fbd38424c9eb93a75da658b9af55be7688dbaeefb005bdc9 guix-build-f58a8678957e/output/arm64-apple-darwin/bitcoin-f58a8678957e-arm64-apple-darwin-unsigned.zip
aa51ca52f7d6289c38417ac83919825ebef540b3681bfa5e95b954d0bbc1ece5 guix-build-f58a8678957e/output/arm64-apple-darwin/bitcoin-f58a8678957e-arm64-apple-darwin.tar.gz
41f187eeba20db1087328fd9bf21cd60ea869aa6b0288864a6c42c585022d7ed guix-build-f58a8678957e/output/dist-archive/bitcoin-f58a8678957e.tar.gz
cd1be902c2d0af6967bed3fbc3c2b5064580333403be6b395b00f294fb558e7d guix-build-f58a8678957e/output/powerpc64-linux-gnu/SHA256SUMS.part
0a3a40bce2e52e1c60859504042f90e7a7fc63fa98258f19edc08de358933e94 guix-build-f58a8678957e/output/powerpc64-linux-gnu/bitcoin-f58a8678957e-powerpc64-linux-gnu-debug.tar.gz
011cb745d14aae9f96fd6610204ea6670f2b4dde723d8ab30241996761253fd1 guix-build-f58a8678957e/output/powerpc64-linux-gnu/bitcoin-f58a8678957e-powerpc64-linux-gnu.tar.gz
b50afc980b4f07b7452577b2a84c746e6c282c6a1239b122155d31b7656346e4 guix-build-f58a8678957e/output/riscv64-linux-gnu/SHA256SUMS.part
2fd021da35b43c748cfa560da6d6755dbed370767fceb11eb8427767ab3c6fcc guix-build-f58a8678957e/output/riscv64-linux-gnu/bitcoin-f58a8678957e-riscv64-linux-gnu-debug.tar.gz
c4d7af36e66eabc9069db5774629aa06882c2d6be464100057d58a16a13fc119 guix-build-f58a8678957e/output/riscv64-linux-gnu/bitcoin-f58a8678957e-riscv64-linux-gnu.tar.gz
038fca155f03bc2ad159ac4546e767b0fab83e61db951df208d33b575be2fb31 guix-build-f58a8678957e/output/x86_64-apple-darwin/SHA256SUMS.part
9e50d7f1e574e8c9ab55f734be6d56ac196cd014f70d88a675044422f13e4cb0 guix-build-f58a8678957e/output/x86_64-apple-darwin/bitcoin-f58a8678957e-x86_64-apple-darwin-unsigned.tar.gz
1edf854f8a0cbe52a36bd2ee4990b38220567038d3585231d20d6e91d076400d guix-build-f58a8678957e/output/x86_64-apple-darwin/bitcoin-f58a8678957e-x86_64-apple-darwin-unsigned.zip
697e8b6a825f1577c275195ea6f77bd75f475cac900a1726e688651d6debafba guix-build-f58a8678957e/output/x86_64-apple-darwin/bitcoin-f58a8678957e-x86_64-apple-darwin.tar.gz
fc6aaa438adab766507f56cd997cd6071a3cbfe0ec6a1a16a16c60f0d7a3e9b4 guix-build-f58a8678957e/output/x86_64-linux-gnu/SHA256SUMS.part
4cb2ea625df852bed28dc569427439a57788f11a652e7be75c7f9e825ac37882 guix-build-f58a8678957e/output/x86_64-linux-gnu/bitcoin-f58a8678957e-x86_64-linux-gnu-debug.tar.gz
b361dddbf2af228ce466e34d0e87a6a2fd51b695e89c6cb03b77e3beaa9c7cf1 guix-build-f58a8678957e/output/x86_64-linux-gnu/bitcoin-f58a8678957e-x86_64-linux-gnu.tar.gz
f73b62162f6e55530c0d785793de85e67a40490174658d70f1004bee78b7a60a guix-build-f58a8678957e/output/x86_64-w64-mingw32/SHA256SUMS.part
0f82a06fac33f8f42cd226f1b61af7157cf24cba41b5955807c71e50fa2d1afa guix-build-f58a8678957e/output/x86_64-w64-mingw32/bitcoin-f58a8678957e-win64-debug.zip
edbc360fc6a4cb3e7b720dfdc3612f8dcb3eb7d827b6de2a964e5a567ab89914 guix-build-f58a8678957e/output/x86_64-w64-mingw32/bitcoin-f58a8678957e-win64-setup-unsigned.exe
25d517098b25269ab895a443852abc103d856d9db165dce7ede595533ba077e2 guix-build-f58a8678957e/output/x86_64-w64-mingw32/bitcoin-f58a8678957e-win64-unsigned.tar.gz
2bcf90f2c17016f026250d1220a8524a59d165f005f8c1fc153c851e385ff125 guix-build-f58a8678957e/output/x86_64-w64-mingw32/bitcoin-f58a8678957e-win64.zip
<!--9cd9c72976c961c55c7acef8f6ba82cd-->
| File | commit 3d24189664e696a2ca1aee2b5ea57b245344e2d4<br>(master) | commit b0ebcc6c4ef90f5753875df9a208af5943b0d0b2<br>(master and this pull) |
|---|---|---|
| SHA256SUMS.part | f659701a6e2d4cd7... |
e7f27d6199d5c5c9... |
| *-aarch64-linux-gnu-debug.tar.gz | 2238885d945acb03... |
3c73c3fab8cd7fed... |
| *-aarch64-linux-gnu.tar.gz | 7dfc8f89b384f468... |
803a91d844e8efc6... |
| *-arm-linux-gnueabihf-debug.tar.gz | 36eb82c148160083... |
1c7ecc58084b16f8... |
| *-arm-linux-gnueabihf.tar.gz | 0cdd25b777f6a659... |
d81cb883f65af1fe... |
| *-arm64-apple-darwin-unsigned.tar.gz | 4d2c71539cce2cc7... |
a54f4bdeb6becae0... |
| *-arm64-apple-darwin-unsigned.zip | 46f9b523ab0ce7c2... |
f5d43a095750c043... |
| *-arm64-apple-darwin.tar.gz | faeaeb0d6d840303... |
7e1e2fa47bb568e7... |
| *-powerpc64-linux-gnu-debug.tar.gz | 1164af07cbdc966c... |
28435c23e7c5d958... |
| *-powerpc64-linux-gnu.tar.gz | 674c0d88a6a969fe... |
28e93fcbd7d9f9ec... |
| *-riscv64-linux-gnu-debug.tar.gz | e63320140a4e108b... |
31a7a78301d47d56... |
| *-riscv64-linux-gnu.tar.gz | 5a28b1cae20a322b... |
72a125ca79f4181a... |
| *-x86_64-apple-darwin-unsigned.tar.gz | 7ec17b78fef01fe0... |
d3f0ea3cc835cd35... |
| *-x86_64-apple-darwin-unsigned.zip | 7ff23984325a5f49... |
b844b8cdf3d3438e... |
| *-x86_64-apple-darwin.tar.gz | 25a595808ba55a41... |
e23cdd74f0991ce9... |
| *-x86_64-linux-gnu-debug.tar.gz | 35a40d56f7bd35f6... |
58ce07b8bb96c1e7... |
| *-x86_64-linux-gnu.tar.gz | ff02631d44b35309... |
2d3922f44a75bc96... |
| *.tar.gz | 0d3e040405e5e3df... |
43a42fb348abf7d7... |
| guix_build.log | 955286393909a603... |
ed8f10a7109a5d11... |
| guix_build.log.diff | 5961c370c3b0952f... |
Guix build (aarch64):
cf99b6597c64c4d0cd75176d261a53f24779e8c3dbe9e891d9d166ae9d00d182 guix-build-f58a8678957e/output/aarch64-linux-gnu/SHA256SUMS.part
922e38e2b1a091f20caa014600936689fb9f14bf56fbd80e4c836c518897ff1f guix-build-f58a8678957e/output/aarch64-linux-gnu/bitcoin-f58a8678957e-aarch64-linux-gnu-debug.tar.gz
256c68e14a905aa6933a2dc83cad636a14ee99ac4661a287e7817efe421965ab guix-build-f58a8678957e/output/aarch64-linux-gnu/bitcoin-f58a8678957e-aarch64-linux-gnu.tar.gz
50eafd4c679cab81c40ed02b1ad4aafb53f8ccf40c497e084596a078977221ed guix-build-f58a8678957e/output/arm-linux-gnueabihf/SHA256SUMS.part
bb89cc308567954302710c809b09992befbbf589c2fa3c33be4b575ad5c619d5 guix-build-f58a8678957e/output/arm-linux-gnueabihf/bitcoin-f58a8678957e-arm-linux-gnueabihf-debug.tar.gz
a83ebe295c39f7581b0d12f5ef58059a54ef0950673a3d0444a73983f83f2468 guix-build-f58a8678957e/output/arm-linux-gnueabihf/bitcoin-f58a8678957e-arm-linux-gnueabihf.tar.gz
50201dbbc968eaa0d050d3d487f3ceef7d637365af5bfb409ecfc6a0e605854c guix-build-f58a8678957e/output/arm64-apple-darwin/SHA256SUMS.part
eee03ae11d7128457850691bb9ffdba083e0b6d179982bd3c63ce3bb356c6692 guix-build-f58a8678957e/output/arm64-apple-darwin/bitcoin-f58a8678957e-arm64-apple-darwin-unsigned.tar.gz
af2d54123313ccd0e251f599bc9d71ba5fef28db9a1a43a730cab0394d9c8804 guix-build-f58a8678957e/output/arm64-apple-darwin/bitcoin-f58a8678957e-arm64-apple-darwin-unsigned.zip
11a71cb3585ff2176267157a1160704b7537015060c7f0ecd73b1bf26ecc74c9 guix-build-f58a8678957e/output/arm64-apple-darwin/bitcoin-f58a8678957e-arm64-apple-darwin.tar.gz
41f187eeba20db1087328fd9bf21cd60ea869aa6b0288864a6c42c585022d7ed guix-build-f58a8678957e/output/dist-archive/bitcoin-f58a8678957e.tar.gz
cd1be902c2d0af6967bed3fbc3c2b5064580333403be6b395b00f294fb558e7d guix-build-f58a8678957e/output/powerpc64-linux-gnu/SHA256SUMS.part
0a3a40bce2e52e1c60859504042f90e7a7fc63fa98258f19edc08de358933e94 guix-build-f58a8678957e/output/powerpc64-linux-gnu/bitcoin-f58a8678957e-powerpc64-linux-gnu-debug.tar.gz
011cb745d14aae9f96fd6610204ea6670f2b4dde723d8ab30241996761253fd1 guix-build-f58a8678957e/output/powerpc64-linux-gnu/bitcoin-f58a8678957e-powerpc64-linux-gnu.tar.gz
b50afc980b4f07b7452577b2a84c746e6c282c6a1239b122155d31b7656346e4 guix-build-f58a8678957e/output/riscv64-linux-gnu/SHA256SUMS.part
2fd021da35b43c748cfa560da6d6755dbed370767fceb11eb8427767ab3c6fcc guix-build-f58a8678957e/output/riscv64-linux-gnu/bitcoin-f58a8678957e-riscv64-linux-gnu-debug.tar.gz
c4d7af36e66eabc9069db5774629aa06882c2d6be464100057d58a16a13fc119 guix-build-f58a8678957e/output/riscv64-linux-gnu/bitcoin-f58a8678957e-riscv64-linux-gnu.tar.gz
038fca155f03bc2ad159ac4546e767b0fab83e61db951df208d33b575be2fb31 guix-build-f58a8678957e/output/x86_64-apple-darwin/SHA256SUMS.part
9e50d7f1e574e8c9ab55f734be6d56ac196cd014f70d88a675044422f13e4cb0 guix-build-f58a8678957e/output/x86_64-apple-darwin/bitcoin-f58a8678957e-x86_64-apple-darwin-unsigned.tar.gz
1edf854f8a0cbe52a36bd2ee4990b38220567038d3585231d20d6e91d076400d guix-build-f58a8678957e/output/x86_64-apple-darwin/bitcoin-f58a8678957e-x86_64-apple-darwin-unsigned.zip
697e8b6a825f1577c275195ea6f77bd75f475cac900a1726e688651d6debafba guix-build-f58a8678957e/output/x86_64-apple-darwin/bitcoin-f58a8678957e-x86_64-apple-darwin.tar.gz
fc6aaa438adab766507f56cd997cd6071a3cbfe0ec6a1a16a16c60f0d7a3e9b4 guix-build-f58a8678957e/output/x86_64-linux-gnu/SHA256SUMS.part
4cb2ea625df852bed28dc569427439a57788f11a652e7be75c7f9e825ac37882 guix-build-f58a8678957e/output/x86_64-linux-gnu/bitcoin-f58a8678957e-x86_64-linux-gnu-debug.tar.gz
b361dddbf2af228ce466e34d0e87a6a2fd51b695e89c6cb03b77e3beaa9c7cf1 guix-build-f58a8678957e/output/x86_64-linux-gnu/bitcoin-f58a8678957e-x86_64-linux-gnu.tar.gz
f73b62162f6e55530c0d785793de85e67a40490174658d70f1004bee78b7a60a guix-build-f58a8678957e/output/x86_64-w64-mingw32/SHA256SUMS.part
0f82a06fac33f8f42cd226f1b61af7157cf24cba41b5955807c71e50fa2d1afa guix-build-f58a8678957e/output/x86_64-w64-mingw32/bitcoin-f58a8678957e-win64-debug.zip
edbc360fc6a4cb3e7b720dfdc3612f8dcb3eb7d827b6de2a964e5a567ab89914 guix-build-f58a8678957e/output/x86_64-w64-mingw32/bitcoin-f58a8678957e-win64-setup-unsigned.exe
25d517098b25269ab895a443852abc103d856d9db165dce7ede595533ba077e2 guix-build-f58a8678957e/output/x86_64-w64-mingw32/bitcoin-f58a8678957e-win64-unsigned.tar.gz
2bcf90f2c17016f026250d1220a8524a59d165f005f8c1fc153c851e385ff125 guix-build-f58a8678957e/output/x86_64-w64-mingw32/bitcoin-f58a8678957e-win64.zip
Looks like there is a mismatch on the arm64 build.
Guix Build (aarch64, x86_64):
a0f00b836d0843e3e9be0cef471f455d113de49da467424718fafeb981490be5 guix-build-e208d5df7937/output/aarch64-linux-gnu/SHA256SUMS.part
a1ccae9ef1a5f4f1641c864c2aa173c7fde2f63de5519c8a13bf2e13b1a16b94 guix-build-e208d5df7937/output/aarch64-linux-gnu/bitcoin-e208d5df7937-aarch64-linux-gnu-debug.tar.gz
79d2affa00eda5657e322b864fe31c49cde9971c5a1ef303fa781d4740748979 guix-build-e208d5df7937/output/aarch64-linux-gnu/bitcoin-e208d5df7937-aarch64-linux-gnu.tar.gz
f8ca89361fcb1b0958756c153ac434b7b7f93b1a95136746367d648e33a017ea guix-build-e208d5df7937/output/arm-linux-gnueabihf/SHA256SUMS.part
2ae9e393b8d363de64226b765bf620851bc58e1dc0409faf3aa9342f1c91d7e4 guix-build-e208d5df7937/output/arm-linux-gnueabihf/bitcoin-e208d5df7937-arm-linux-gnueabihf-debug.tar.gz
63955c4254a76f554dcb2574eb5d0eea7827360199ba8994544a7f1e73f2d7b8 guix-build-e208d5df7937/output/arm-linux-gnueabihf/bitcoin-e208d5df7937-arm-linux-gnueabihf.tar.gz
5bcde35563e11ae191ec424bb43227f76c91d5819fdf336cb679763fb4f37b08 guix-build-e208d5df7937/output/arm64-apple-darwin/SHA256SUMS.part
9b3f1fb66cf2956d7dd65e9beaa6221d37d8070b08a0f839b80d48c183901c96 guix-build-e208d5df7937/output/arm64-apple-darwin/bitcoin-e208d5df7937-arm64-apple-darwin-unsigned.tar.gz
b51bbc77fdaf6db5d460450b8f93a9b5f9d225e915faaa055372778fe5b285ac guix-build-e208d5df7937/output/arm64-apple-darwin/bitcoin-e208d5df7937-arm64-apple-darwin-unsigned.zip
133ebf8255bc48ab79d79ee03c3cf797f85d61867d5f38c3fce5a11d284ca696 guix-build-e208d5df7937/output/arm64-apple-darwin/bitcoin-e208d5df7937-arm64-apple-darwin.tar.gz
5d2ad53e635b3ec0917a74627a8bacfd3efccd3dc2b05268d012a506c56f5ca6 guix-build-e208d5df7937/output/dist-archive/bitcoin-e208d5df7937.tar.gz
df2f04b6139c25d7af8e6d6a1d126a35aeab599b2ae948c4084d7a1e9abe5378 guix-build-e208d5df7937/output/powerpc64-linux-gnu/SHA256SUMS.part
438bd47ffadea4967f9a4542898d8ff931d0ae27bb4f535631362224409ba2cd guix-build-e208d5df7937/output/powerpc64-linux-gnu/bitcoin-e208d5df7937-powerpc64-linux-gnu-debug.tar.gz
4052325b00ede1c5a1b5b5896d55e89abc72216ede2e25f4cf6da62873a0f30a guix-build-e208d5df7937/output/powerpc64-linux-gnu/bitcoin-e208d5df7937-powerpc64-linux-gnu.tar.gz
5bbbf8009e3e1f4ed7f058dc562b3e3c64613e45c8ddf92049e205978cb6e540 guix-build-e208d5df7937/output/riscv64-linux-gnu/SHA256SUMS.part
9cb924b9826be7738b604e86150b667e4a52d0771e87e59337ba9b1a1fdef18e guix-build-e208d5df7937/output/riscv64-linux-gnu/bitcoin-e208d5df7937-riscv64-linux-gnu-debug.tar.gz
19c50189af630703c45a42bf567cea7334c142315d4769de6e613b97a9079942 guix-build-e208d5df7937/output/riscv64-linux-gnu/bitcoin-e208d5df7937-riscv64-linux-gnu.tar.gz
8e17100eed1dd9f37667ea91163006ad93d5abfb718d423e90a93810465d19a0 guix-build-e208d5df7937/output/x86_64-apple-darwin/SHA256SUMS.part
1c4c1e764d199b404d29923724339e518973b9861f1bf2ee3c58fe67ef4f91f1 guix-build-e208d5df7937/output/x86_64-apple-darwin/bitcoin-e208d5df7937-x86_64-apple-darwin-unsigned.tar.gz
916ed3b18162215be8f331e521170fca10afeb03d0348aad00731b419351ae11 guix-build-e208d5df7937/output/x86_64-apple-darwin/bitcoin-e208d5df7937-x86_64-apple-darwin-unsigned.zip
6caf13d5bc229b5017bc0292586e79d751917410c7d39889db39b97ac70b6597 guix-build-e208d5df7937/output/x86_64-apple-darwin/bitcoin-e208d5df7937-x86_64-apple-darwin.tar.gz
45c74fc8b64f808d27836c8b12fe433447606fbc8e06f42825003fe0ab9e963b guix-build-e208d5df7937/output/x86_64-linux-gnu/SHA256SUMS.part
60f9182ff31c5ac33f4b22c8150146185c66368ca0524809879bfcf7faca9b4c guix-build-e208d5df7937/output/x86_64-linux-gnu/bitcoin-e208d5df7937-x86_64-linux-gnu-debug.tar.gz
e7e4b0a37766a891d2c63a9fca5e9f3694e9af3d67a08726cb036ddf1ab21bc2 guix-build-e208d5df7937/output/x86_64-linux-gnu/bitcoin-e208d5df7937-x86_64-linux-gnu.tar.gz
be58ad405308a41a75c8d4901737ec8875de009e7d3b29b40913d3c7452cc580 guix-build-e208d5df7937/output/x86_64-w64-mingw32/SHA256SUMS.part
78974f958c83411cab5404703ec47b83b97ba636af3761293970960cfe08064d guix-build-e208d5df7937/output/x86_64-w64-mingw32/bitcoin-e208d5df7937-win64-debug.zip
fb10861ab7f7c9b13255660dde2f7b8ad8fab9cebe4e1324aaea052364fe8a7d guix-build-e208d5df7937/output/x86_64-w64-mingw32/bitcoin-e208d5df7937-win64-setup-unsigned.exe
0b4cc5f9702c2f3f33852097c83fa81c26589aa7cd24bc3257527218fbd86943 guix-build-e208d5df7937/output/x86_64-w64-mingw32/bitcoin-e208d5df7937-win64-unsigned.tar.gz
d158efd3734dc549be953ff5ca662eff479e8b2d7f7eeef08eb13f4b442ce82d guix-build-e208d5df7937/output/x86_64-w64-mingw32/bitcoin-e208d5df7937-win64.zip
143 | - # no longer affect our build, as clang would instead reach for 144 | - # x86_64-apple-darwin-ld from cctools 145 | - ;; 146 | - *) export GUIX_LD_WRAPPER_DISABLE_RPATH=yes ;; 147 | -esac 148 | +export GUIX_LD_WRAPPER_DISABLE_RPATH=yes
Why?
Why are we setting this, or why are we dropping it for Darwin?
We no-longer need it given we aren't building Darwin tools. It's been disabled for all other hosts since Guix was introduced. I can dig up the history and post it here.
Ah, sorry, I misread. Had it backwards. It looked like it was being applied only to darwin before, but it was applied to everything but darwin before. Now darwin is no longer an exception.
Thanks.
DSYMUTIL does not get properly set in the config.site after these changes, and the wrong one ends up being found by our configure.
It's not clear to me if dsymutil ends up being used as part of our build at all. If so we should fix depends, if not we should remove it.
It's not clear to me if dsymutil ends up being used as part of our build at all. If so we should fix depends, if not we should remove it.
I think it might actually be unused at this point, but also have a vauge memory of a Qt related failure, if it's missing.. Have pushed up a change to have it set properly for now.
47 | @@ -40,19 +48,14 @@ llvm_config_prog=$(shell $(SHELL) $(.SHELLFLAGS) "command -v llvm-config") 48 | 49 | llvm_lib_dir=$(shell $(llvm_config_prog) --libdir) 50 | 51 | +darwin_AR=$(shell $(SHELL) $(.SHELLFLAGS) "command -v llvm-ar") 52 | +darwin_DSYMUTIL=$(shell $(SHELL) $(.SHELLFLAGS) "command -v dsymutil")
Needs update?
In Guix this should just be dsymutil, not llvm-dsymutil.
Clang actually expects this all the time, so just dsymutil is correct in depends as well (so we can't copy the bin as llvm-dsymutil) (this was the qt related issue I had seen before).
Not supported by llvm-ar / llvm-ranlib.
Only build ld64 from cctools.
Disable adhoc codesigning, to avoid non-determinism.
Adjust the security check for:
ld64.lld: warning: Option `-allow_stack_execute' is not yet implemented.
ld64.lld: error: -fixup_chains is incompatible with -no_pie
and to account for the embedding of LLVMs version number.
LLD enables ZERO_AR_DATE by default, setting it to zero would enable
non-determinism, setting it to any other value is ignored.
See:
https://github.com/llvm/llvm-project/blob/main/lld/docs/MachO/ld64-vs-lld.rst.
Guix build (aarch64):
00becde2dd12878e3b9f50f27899a6a8b752343dade7c71781632715c3001473 guix-build-e8c25e8a35e3/output/aarch64-linux-gnu/SHA256SUMS.part
a685b9cee54014e74639be1e8db2d55b7c008fdb3b31c1c708c364a49b56759a guix-build-e8c25e8a35e3/output/aarch64-linux-gnu/bitcoin-e8c25e8a35e3-aarch64-linux-gnu-debug.tar.gz
d61228158409802e5aef11c39a0da5653a6c7e870d5f500483c32c75f319e8b6 guix-build-e8c25e8a35e3/output/aarch64-linux-gnu/bitcoin-e8c25e8a35e3-aarch64-linux-gnu.tar.gz
49447a196ead1f153cbebab2e22d229cb48f2736eec5c912c2ec5cebf8a58cad guix-build-e8c25e8a35e3/output/arm-linux-gnueabihf/SHA256SUMS.part
1e4510f6a5145810577b8ebc2eb5f38b3d2c28845e9d84ffe000d8cbb82429fa guix-build-e8c25e8a35e3/output/arm-linux-gnueabihf/bitcoin-e8c25e8a35e3-arm-linux-gnueabihf-debug.tar.gz
a3c014032ac22c2fc0034a5708b157884395f37f3d20dfa6070cfb2a6aeebdf5 guix-build-e8c25e8a35e3/output/arm-linux-gnueabihf/bitcoin-e8c25e8a35e3-arm-linux-gnueabihf.tar.gz
6377bf759602fb5dc00d7992b126ddc75cf03d71ce259c76c509299dac51be52 guix-build-e8c25e8a35e3/output/arm64-apple-darwin/SHA256SUMS.part
7191d5a512ac9b7e934e771985eb2743180a00285b3e5275de1ffdc1e504e68e guix-build-e8c25e8a35e3/output/arm64-apple-darwin/bitcoin-e8c25e8a35e3-arm64-apple-darwin-unsigned.tar.gz
73516bfd8acb17f865b53e67e421dccfd0644c6582f462d8ebe710291c2b5367 guix-build-e8c25e8a35e3/output/arm64-apple-darwin/bitcoin-e8c25e8a35e3-arm64-apple-darwin-unsigned.zip
07cc918282582193d8745cc7dcd4a4a4474e38d079b0d2831efdef59cb322449 guix-build-e8c25e8a35e3/output/arm64-apple-darwin/bitcoin-e8c25e8a35e3-arm64-apple-darwin.tar.gz
edcc1c61aa12b78c7a8e87d141832891e05f48b4a687ed7e3fae668236f339ff guix-build-e8c25e8a35e3/output/dist-archive/bitcoin-e8c25e8a35e3.tar.gz
29601464afa40104ad8c6b4b10a5fde0649aba6f4bfea1b93258b7bfcaab7a5a guix-build-e8c25e8a35e3/output/powerpc64-linux-gnu/SHA256SUMS.part
65c308cddf5cbac4132104a5b4d6cf7ec85e88b4f967c66cd942742996def56a guix-build-e8c25e8a35e3/output/powerpc64-linux-gnu/bitcoin-e8c25e8a35e3-powerpc64-linux-gnu-debug.tar.gz
513c91b558e52ac27e6e33d916bfc378a6be6b2b218fb37712f05a44746fb68d guix-build-e8c25e8a35e3/output/powerpc64-linux-gnu/bitcoin-e8c25e8a35e3-powerpc64-linux-gnu.tar.gz
72c790770e49bacd4e66eb2e93f6a3a2dc596c36254bf1ec00775bbd60121c31 guix-build-e8c25e8a35e3/output/riscv64-linux-gnu/SHA256SUMS.part
c7921f8f5bfe5c463e266b24399e600c2b67552a50dbf1414cacb5805271c561 guix-build-e8c25e8a35e3/output/riscv64-linux-gnu/bitcoin-e8c25e8a35e3-riscv64-linux-gnu-debug.tar.gz
4f106246e1184a32289d2ba5251fc00af852e38351e45b3bcd974d1b099e515b guix-build-e8c25e8a35e3/output/riscv64-linux-gnu/bitcoin-e8c25e8a35e3-riscv64-linux-gnu.tar.gz
4e26090aa5ffb709088cb4e4e6aba32c0c2017a1fa776f5ec4d7be36e3ccb8aa guix-build-e8c25e8a35e3/output/x86_64-apple-darwin/SHA256SUMS.part
87282cc09b9c57416c8f92ff5ae2614c9a9d26fdcfe3c16931df0fdedae9e1b4 guix-build-e8c25e8a35e3/output/x86_64-apple-darwin/bitcoin-e8c25e8a35e3-x86_64-apple-darwin-unsigned.tar.gz
25fd762a3a7b0d81f738c3b63272188094d42139b39c6f8dd92c30c54ccc86be guix-build-e8c25e8a35e3/output/x86_64-apple-darwin/bitcoin-e8c25e8a35e3-x86_64-apple-darwin-unsigned.zip
d8c01baf156546546620d0ab17933478772527be4701b7479881a5547c527e2a guix-build-e8c25e8a35e3/output/x86_64-apple-darwin/bitcoin-e8c25e8a35e3-x86_64-apple-darwin.tar.gz
b4eafb5e1c6730105e47cd7cd6ede361a4487250c903661c0ccebce8eeda5898 guix-build-e8c25e8a35e3/output/x86_64-linux-gnu/SHA256SUMS.part
819e54887b0eb2d659dccfbfcec9a1d49e47914ce46baae3b52b2821a844098a guix-build-e8c25e8a35e3/output/x86_64-linux-gnu/bitcoin-e8c25e8a35e3-x86_64-linux-gnu-debug.tar.gz
25e48ea3a8f2d86ebea8d8ea96a902f3494197e93a65d4ff986d37506771a43a guix-build-e8c25e8a35e3/output/x86_64-linux-gnu/bitcoin-e8c25e8a35e3-x86_64-linux-gnu.tar.gz
d73e31db2488cf422704e3abf432bb430f9155b8aafd4a9a501f826785cbe1d9 guix-build-e8c25e8a35e3/output/x86_64-w64-mingw32/SHA256SUMS.part
23818afba6bbd8de1c2c2d6d6b64c05d87400d424f4c9db516b854c75b29f50a guix-build-e8c25e8a35e3/output/x86_64-w64-mingw32/bitcoin-e8c25e8a35e3-win64-debug.zip
facdda5d82b05091bb98419c7b6913e4d0019c58f4d67f95d750fc632e32c611 guix-build-e8c25e8a35e3/output/x86_64-w64-mingw32/bitcoin-e8c25e8a35e3-win64-setup-unsigned.exe
45a1252ce93fb0d8e1ebde66c16542c1bbc8b6efd6280ec7f1553415f80461fd guix-build-e8c25e8a35e3/output/x86_64-w64-mingw32/bitcoin-e8c25e8a35e3-win64-unsigned.tar.gz
8b4bc3b6cd78713e045db74eed4b3fbd711dd7e09980da386100e72dce33097e guix-build-e8c25e8a35e3/output/x86_64-w64-mingw32/bitcoin-e8c25e8a35e3-win64.zip
Another mismatch, this time on riscv64 -_-
Another mismatch, this time on riscv64 -_-
I've just rebuilt on 2 different machines (one aarch64 one x86_64), and they match your output here (removing my comment above):
00becde2dd12878e3b9f50f27899a6a8b752343dade7c71781632715c3001473 guix-build-e8c25e8a35e3/output/aarch64-linux-gnu/SHA256SUMS.part
a685b9cee54014e74639be1e8db2d55b7c008fdb3b31c1c708c364a49b56759a guix-build-e8c25e8a35e3/output/aarch64-linux-gnu/bitcoin-e8c25e8a35e3-aarch64-linux-gnu-debug.tar.gz
d61228158409802e5aef11c39a0da5653a6c7e870d5f500483c32c75f319e8b6 guix-build-e8c25e8a35e3/output/aarch64-linux-gnu/bitcoin-e8c25e8a35e3-aarch64-linux-gnu.tar.gz
49447a196ead1f153cbebab2e22d229cb48f2736eec5c912c2ec5cebf8a58cad guix-build-e8c25e8a35e3/output/arm-linux-gnueabihf/SHA256SUMS.part
1e4510f6a5145810577b8ebc2eb5f38b3d2c28845e9d84ffe000d8cbb82429fa guix-build-e8c25e8a35e3/output/arm-linux-gnueabihf/bitcoin-e8c25e8a35e3-arm-linux-gnueabihf-debug.tar.gz
a3c014032ac22c2fc0034a5708b157884395f37f3d20dfa6070cfb2a6aeebdf5 guix-build-e8c25e8a35e3/output/arm-linux-gnueabihf/bitcoin-e8c25e8a35e3-arm-linux-gnueabihf.tar.gz
6377bf759602fb5dc00d7992b126ddc75cf03d71ce259c76c509299dac51be52 guix-build-e8c25e8a35e3/output/arm64-apple-darwin/SHA256SUMS.part
7191d5a512ac9b7e934e771985eb2743180a00285b3e5275de1ffdc1e504e68e guix-build-e8c25e8a35e3/output/arm64-apple-darwin/bitcoin-e8c25e8a35e3-arm64-apple-darwin-unsigned.tar.gz
73516bfd8acb17f865b53e67e421dccfd0644c6582f462d8ebe710291c2b5367 guix-build-e8c25e8a35e3/output/arm64-apple-darwin/bitcoin-e8c25e8a35e3-arm64-apple-darwin-unsigned.zip
07cc918282582193d8745cc7dcd4a4a4474e38d079b0d2831efdef59cb322449 guix-build-e8c25e8a35e3/output/arm64-apple-darwin/bitcoin-e8c25e8a35e3-arm64-apple-darwin.tar.gz
edcc1c61aa12b78c7a8e87d141832891e05f48b4a687ed7e3fae668236f339ff guix-build-e8c25e8a35e3/output/dist-archive/bitcoin-e8c25e8a35e3.tar.gz
29601464afa40104ad8c6b4b10a5fde0649aba6f4bfea1b93258b7bfcaab7a5a guix-build-e8c25e8a35e3/output/powerpc64-linux-gnu/SHA256SUMS.part
65c308cddf5cbac4132104a5b4d6cf7ec85e88b4f967c66cd942742996def56a guix-build-e8c25e8a35e3/output/powerpc64-linux-gnu/bitcoin-e8c25e8a35e3-powerpc64-linux-gnu-debug.tar.gz
513c91b558e52ac27e6e33d916bfc378a6be6b2b218fb37712f05a44746fb68d guix-build-e8c25e8a35e3/output/powerpc64-linux-gnu/bitcoin-e8c25e8a35e3-powerpc64-linux-gnu.tar.gz
72c790770e49bacd4e66eb2e93f6a3a2dc596c36254bf1ec00775bbd60121c31 guix-build-e8c25e8a35e3/output/riscv64-linux-gnu/SHA256SUMS.part
c7921f8f5bfe5c463e266b24399e600c2b67552a50dbf1414cacb5805271c561 guix-build-e8c25e8a35e3/output/riscv64-linux-gnu/bitcoin-e8c25e8a35e3-riscv64-linux-gnu-debug.tar.gz
4f106246e1184a32289d2ba5251fc00af852e38351e45b3bcd974d1b099e515b guix-build-e8c25e8a35e3/output/riscv64-linux-gnu/bitcoin-e8c25e8a35e3-riscv64-linux-gnu.tar.gz
4e26090aa5ffb709088cb4e4e6aba32c0c2017a1fa776f5ec4d7be36e3ccb8aa guix-build-e8c25e8a35e3/output/x86_64-apple-darwin/SHA256SUMS.part
87282cc09b9c57416c8f92ff5ae2614c9a9d26fdcfe3c16931df0fdedae9e1b4 guix-build-e8c25e8a35e3/output/x86_64-apple-darwin/bitcoin-e8c25e8a35e3-x86_64-apple-darwin-unsigned.tar.gz
25fd762a3a7b0d81f738c3b63272188094d42139b39c6f8dd92c30c54ccc86be guix-build-e8c25e8a35e3/output/x86_64-apple-darwin/bitcoin-e8c25e8a35e3-x86_64-apple-darwin-unsigned.zip
d8c01baf156546546620d0ab17933478772527be4701b7479881a5547c527e2a guix-build-e8c25e8a35e3/output/x86_64-apple-darwin/bitcoin-e8c25e8a35e3-x86_64-apple-darwin.tar.gz
b4eafb5e1c6730105e47cd7cd6ede361a4487250c903661c0ccebce8eeda5898 guix-build-e8c25e8a35e3/output/x86_64-linux-gnu/SHA256SUMS.part
819e54887b0eb2d659dccfbfcec9a1d49e47914ce46baae3b52b2821a844098a guix-build-e8c25e8a35e3/output/x86_64-linux-gnu/bitcoin-e8c25e8a35e3-x86_64-linux-gnu-debug.tar.gz
25e48ea3a8f2d86ebea8d8ea96a902f3494197e93a65d4ff986d37506771a43a guix-build-e8c25e8a35e3/output/x86_64-linux-gnu/bitcoin-e8c25e8a35e3-x86_64-linux-gnu.tar.gz
d73e31db2488cf422704e3abf432bb430f9155b8aafd4a9a501f826785cbe1d9 guix-build-e8c25e8a35e3/output/x86_64-w64-mingw32/SHA256SUMS.part
23818afba6bbd8de1c2c2d6d6b64c05d87400d424f4c9db516b854c75b29f50a guix-build-e8c25e8a35e3/output/x86_64-w64-mingw32/bitcoin-e8c25e8a35e3-win64-debug.zip
facdda5d82b05091bb98419c7b6913e4d0019c58f4d67f95d750fc632e32c611 guix-build-e8c25e8a35e3/output/x86_64-w64-mingw32/bitcoin-e8c25e8a35e3-win64-setup-unsigned.exe
45a1252ce93fb0d8e1ebde66c16542c1bbc8b6efd6280ec7f1553415f80461fd guix-build-e8c25e8a35e3/output/x86_64-w64-mingw32/bitcoin-e8c25e8a35e3-win64-unsigned.tar.gz
8b4bc3b6cd78713e045db74eed4b3fbd711dd7e09980da386100e72dce33097e guix-build-e8c25e8a35e3/output/x86_64-w64-mingw32/bitcoin-e8c25e8a35e3-win64.zip
I think it might actually be unused at this point, but also have a vauge memory of a Qt related failure, if it's missing.. Have pushed up a change to have it set properly for now.
Thanks, can confirm the correct one is picked up by our configure now.
Tested e8c25e8a35e333e90514945c592557615641553f: the guix build, a local depends build and a local normal build on Intel macOS 14.5. Tested a normal build on macOS 13.6.7.
Guix hashes (Ubuntu, AMD), matches what @TheCharlatan and @fanquake found above.
00becde2dd12878e3b9f50f27899a6a8b752343dade7c71781632715c3001473 guix-build-e8c25e8a35e3/output/aarch64-linux-gnu/SHA256SUMS.part
a685b9cee54014e74639be1e8db2d55b7c008fdb3b31c1c708c364a49b56759a guix-build-e8c25e8a35e3/output/aarch64-linux-gnu/bitcoin-e8c25e8a35e3-aarch64-linux-gnu-debug.tar.gz
d61228158409802e5aef11c39a0da5653a6c7e870d5f500483c32c75f319e8b6 guix-build-e8c25e8a35e3/output/aarch64-linux-gnu/bitcoin-e8c25e8a35e3-aarch64-linux-gnu.tar.gz
49447a196ead1f153cbebab2e22d229cb48f2736eec5c912c2ec5cebf8a58cad guix-build-e8c25e8a35e3/output/arm-linux-gnueabihf/SHA256SUMS.part
1e4510f6a5145810577b8ebc2eb5f38b3d2c28845e9d84ffe000d8cbb82429fa guix-build-e8c25e8a35e3/output/arm-linux-gnueabihf/bitcoin-e8c25e8a35e3-arm-linux-gnueabihf-debug.tar.gz
a3c014032ac22c2fc0034a5708b157884395f37f3d20dfa6070cfb2a6aeebdf5 guix-build-e8c25e8a35e3/output/arm-linux-gnueabihf/bitcoin-e8c25e8a35e3-arm-linux-gnueabihf.tar.gz
6377bf759602fb5dc00d7992b126ddc75cf03d71ce259c76c509299dac51be52 guix-build-e8c25e8a35e3/output/arm64-apple-darwin/SHA256SUMS.part
7191d5a512ac9b7e934e771985eb2743180a00285b3e5275de1ffdc1e504e68e guix-build-e8c25e8a35e3/output/arm64-apple-darwin/bitcoin-e8c25e8a35e3-arm64-apple-darwin-unsigned.tar.gz
73516bfd8acb17f865b53e67e421dccfd0644c6582f462d8ebe710291c2b5367 guix-build-e8c25e8a35e3/output/arm64-apple-darwin/bitcoin-e8c25e8a35e3-arm64-apple-darwin-unsigned.zip
07cc918282582193d8745cc7dcd4a4a4474e38d079b0d2831efdef59cb322449 guix-build-e8c25e8a35e3/output/arm64-apple-darwin/bitcoin-e8c25e8a35e3-arm64-apple-darwin.tar.gz
edcc1c61aa12b78c7a8e87d141832891e05f48b4a687ed7e3fae668236f339ff guix-build-e8c25e8a35e3/output/dist-archive/bitcoin-e8c25e8a35e3.tar.gz
29601464afa40104ad8c6b4b10a5fde0649aba6f4bfea1b93258b7bfcaab7a5a guix-build-e8c25e8a35e3/output/powerpc64-linux-gnu/SHA256SUMS.part
65c308cddf5cbac4132104a5b4d6cf7ec85e88b4f967c66cd942742996def56a guix-build-e8c25e8a35e3/output/powerpc64-linux-gnu/bitcoin-e8c25e8a35e3-powerpc64-linux-gnu-debug.tar.gz
513c91b558e52ac27e6e33d916bfc378a6be6b2b218fb37712f05a44746fb68d guix-build-e8c25e8a35e3/output/powerpc64-linux-gnu/bitcoin-e8c25e8a35e3-powerpc64-linux-gnu.tar.gz
72c790770e49bacd4e66eb2e93f6a3a2dc596c36254bf1ec00775bbd60121c31 guix-build-e8c25e8a35e3/output/riscv64-linux-gnu/SHA256SUMS.part
c7921f8f5bfe5c463e266b24399e600c2b67552a50dbf1414cacb5805271c561 guix-build-e8c25e8a35e3/output/riscv64-linux-gnu/bitcoin-e8c25e8a35e3-riscv64-linux-gnu-debug.tar.gz
4f106246e1184a32289d2ba5251fc00af852e38351e45b3bcd974d1b099e515b guix-build-e8c25e8a35e3/output/riscv64-linux-gnu/bitcoin-e8c25e8a35e3-riscv64-linux-gnu.tar.gz
4e26090aa5ffb709088cb4e4e6aba32c0c2017a1fa776f5ec4d7be36e3ccb8aa guix-build-e8c25e8a35e3/output/x86_64-apple-darwin/SHA256SUMS.part
87282cc09b9c57416c8f92ff5ae2614c9a9d26fdcfe3c16931df0fdedae9e1b4 guix-build-e8c25e8a35e3/output/x86_64-apple-darwin/bitcoin-e8c25e8a35e3-x86_64-apple-darwin-unsigned.tar.gz
25fd762a3a7b0d81f738c3b63272188094d42139b39c6f8dd92c30c54ccc86be guix-build-e8c25e8a35e3/output/x86_64-apple-darwin/bitcoin-e8c25e8a35e3-x86_64-apple-darwin-unsigned.zip
d8c01baf156546546620d0ab17933478772527be4701b7479881a5547c527e2a guix-build-e8c25e8a35e3/output/x86_64-apple-darwin/bitcoin-e8c25e8a35e3-x86_64-apple-darwin.tar.gz
b4eafb5e1c6730105e47cd7cd6ede361a4487250c903661c0ccebce8eeda5898 guix-build-e8c25e8a35e3/output/x86_64-linux-gnu/SHA256SUMS.part
819e54887b0eb2d659dccfbfcec9a1d49e47914ce46baae3b52b2821a844098a guix-build-e8c25e8a35e3/output/x86_64-linux-gnu/bitcoin-e8c25e8a35e3-x86_64-linux-gnu-debug.tar.gz
25e48ea3a8f2d86ebea8d8ea96a902f3494197e93a65d4ff986d37506771a43a guix-build-e8c25e8a35e3/output/x86_64-linux-gnu/bitcoin-e8c25e8a35e3-x86_64-linux-gnu.tar.gz
d73e31db2488cf422704e3abf432bb430f9155b8aafd4a9a501f826785cbe1d9 guix-build-e8c25e8a35e3/output/x86_64-w64-mingw32/SHA256SUMS.part
23818afba6bbd8de1c2c2d6d6b64c05d87400d424f4c9db516b854c75b29f50a guix-build-e8c25e8a35e3/output/x86_64-w64-mingw32/bitcoin-e8c25e8a35e3-win64-debug.zip
facdda5d82b05091bb98419c7b6913e4d0019c58f4d67f95d750fc632e32c611 guix-build-e8c25e8a35e3/output/x86_64-w64-mingw32/bitcoin-e8c25e8a35e3-win64-setup-unsigned.exe
45a1252ce93fb0d8e1ebde66c16542c1bbc8b6efd6280ec7f1553415f80461fd guix-build-e8c25e8a35e3/output/x86_64-w64-mingw32/bitcoin-e8c25e8a35e3-win64-unsigned.tar.gz
8b4bc3b6cd78713e045db74eed4b3fbd711dd7e09980da386100e72dce33097e guix-build-e8c25e8a35e3/output/x86_64-w64-mingw32/bitcoin-e8c25e8a35e3-win64.zip
Tentative ACK e8c25e8a35e333e90514945c592557615641553f.
There's a lot going on here and I'm not 100% confident, but I'm out of things to complain about :)
I presume macos-cross compilation on risv64 metal still fails? If it is expected to pass now, I can re-try this.
If it is expected to pass now, I can re-try this.
Quite possible it'll pass now. Given the previous failure was in compiling cctools.
Did a Guix build for arm64-apple-darwin using emulated riscv64-linux on x86_64, and the results match the x86_64 and aarch64 builds:
6377bf759602fb5dc00d7992b126ddc75cf03d71ce259c76c509299dac51be52 guix-build-e8c25e8a35e3/output/arm64-apple-darwin/SHA256SUMS.part
7191d5a512ac9b7e934e771985eb2743180a00285b3e5275de1ffdc1e504e68e guix-build-e8c25e8a35e3/output/arm64-apple-darwin/bitcoin-e8c25e8a35e3-arm64-apple-darwin-unsigned.tar.gz
73516bfd8acb17f865b53e67e421dccfd0644c6582f462d8ebe710291c2b5367 guix-build-e8c25e8a35e3/output/arm64-apple-darwin/bitcoin-e8c25e8a35e3-arm64-apple-darwin-unsigned.zip
07cc918282582193d8745cc7dcd4a4a4474e38d079b0d2831efdef59cb322449 guix-build-e8c25e8a35e3/output/arm64-apple-darwin/bitcoin-e8c25e8a35e3-arm64-apple-darwin.tar.gz
edcc1c61aa12b78c7a8e87d141832891e05f48b4a687ed7e3fae668236f339ff guix-build-e8c25e8a35e3/output/dist-archive/bitcoin-e8c25e8a35e3.tar.gz
Post-merge ACK e8c25e8a35e3
uname -a && find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
Linux starfive 5.15.0-starfive [#1](/bitcoin-bitcoin/1/) SMP Sun Mar 26 12:29:48 EDT 2023 riscv64 GNU/Linux
00becde2dd12878e3b9f50f27899a6a8b752343dade7c71781632715c3001473 guix-build-e8c25e8a35e3/output/aarch64-linux-gnu/SHA256SUMS.part
a685b9cee54014e74639be1e8db2d55b7c008fdb3b31c1c708c364a49b56759a guix-build-e8c25e8a35e3/output/aarch64-linux-gnu/bitcoin-e8c25e8a35e3-aarch64-linux-gnu-debug.tar.gz
d61228158409802e5aef11c39a0da5653a6c7e870d5f500483c32c75f319e8b6 guix-build-e8c25e8a35e3/output/aarch64-linux-gnu/bitcoin-e8c25e8a35e3-aarch64-linux-gnu.tar.gz
49447a196ead1f153cbebab2e22d229cb48f2736eec5c912c2ec5cebf8a58cad guix-build-e8c25e8a35e3/output/arm-linux-gnueabihf/SHA256SUMS.part
1e4510f6a5145810577b8ebc2eb5f38b3d2c28845e9d84ffe000d8cbb82429fa guix-build-e8c25e8a35e3/output/arm-linux-gnueabihf/bitcoin-e8c25e8a35e3-arm-linux-gnueabihf-debug.tar.gz
a3c014032ac22c2fc0034a5708b157884395f37f3d20dfa6070cfb2a6aeebdf5 guix-build-e8c25e8a35e3/output/arm-linux-gnueabihf/bitcoin-e8c25e8a35e3-arm-linux-gnueabihf.tar.gz
6377bf759602fb5dc00d7992b126ddc75cf03d71ce259c76c509299dac51be52 guix-build-e8c25e8a35e3/output/arm64-apple-darwin/SHA256SUMS.part
7191d5a512ac9b7e934e771985eb2743180a00285b3e5275de1ffdc1e504e68e guix-build-e8c25e8a35e3/output/arm64-apple-darwin/bitcoin-e8c25e8a35e3-arm64-apple-darwin-unsigned.tar.gz
73516bfd8acb17f865b53e67e421dccfd0644c6582f462d8ebe710291c2b5367 guix-build-e8c25e8a35e3/output/arm64-apple-darwin/bitcoin-e8c25e8a35e3-arm64-apple-darwin-unsigned.zip
07cc918282582193d8745cc7dcd4a4a4474e38d079b0d2831efdef59cb322449 guix-build-e8c25e8a35e3/output/arm64-apple-darwin/bitcoin-e8c25e8a35e3-arm64-apple-darwin.tar.gz
edcc1c61aa12b78c7a8e87d141832891e05f48b4a687ed7e3fae668236f339ff guix-build-e8c25e8a35e3/output/dist-archive/bitcoin-e8c25e8a35e3.tar.gz
29601464afa40104ad8c6b4b10a5fde0649aba6f4bfea1b93258b7bfcaab7a5a guix-build-e8c25e8a35e3/output/powerpc64-linux-gnu/SHA256SUMS.part
65c308cddf5cbac4132104a5b4d6cf7ec85e88b4f967c66cd942742996def56a guix-build-e8c25e8a35e3/output/powerpc64-linux-gnu/bitcoin-e8c25e8a35e3-powerpc64-linux-gnu-debug.tar.gz
513c91b558e52ac27e6e33d916bfc378a6be6b2b218fb37712f05a44746fb68d guix-build-e8c25e8a35e3/output/powerpc64-linux-gnu/bitcoin-e8c25e8a35e3-powerpc64-linux-gnu.tar.gz
72c790770e49bacd4e66eb2e93f6a3a2dc596c36254bf1ec00775bbd60121c31 guix-build-e8c25e8a35e3/output/riscv64-linux-gnu/SHA256SUMS.part
c7921f8f5bfe5c463e266b24399e600c2b67552a50dbf1414cacb5805271c561 guix-build-e8c25e8a35e3/output/riscv64-linux-gnu/bitcoin-e8c25e8a35e3-riscv64-linux-gnu-debug.tar.gz
4f106246e1184a32289d2ba5251fc00af852e38351e45b3bcd974d1b099e515b guix-build-e8c25e8a35e3/output/riscv64-linux-gnu/bitcoin-e8c25e8a35e3-riscv64-linux-gnu.tar.gz
4e26090aa5ffb709088cb4e4e6aba32c0c2017a1fa776f5ec4d7be36e3ccb8aa guix-build-e8c25e8a35e3/output/x86_64-apple-darwin/SHA256SUMS.part
87282cc09b9c57416c8f92ff5ae2614c9a9d26fdcfe3c16931df0fdedae9e1b4 guix-build-e8c25e8a35e3/output/x86_64-apple-darwin/bitcoin-e8c25e8a35e3-x86_64-apple-darwin-unsigned.tar.gz
25fd762a3a7b0d81f738c3b63272188094d42139b39c6f8dd92c30c54ccc86be guix-build-e8c25e8a35e3/output/x86_64-apple-darwin/bitcoin-e8c25e8a35e3-x86_64-apple-darwin-unsigned.zip
d8c01baf156546546620d0ab17933478772527be4701b7479881a5547c527e2a guix-build-e8c25e8a35e3/output/x86_64-apple-darwin/bitcoin-e8c25e8a35e3-x86_64-apple-darwin.tar.gz
b4eafb5e1c6730105e47cd7cd6ede361a4487250c903661c0ccebce8eeda5898 guix-build-e8c25e8a35e3/output/x86_64-linux-gnu/SHA256SUMS.part
819e54887b0eb2d659dccfbfcec9a1d49e47914ce46baae3b52b2821a844098a guix-build-e8c25e8a35e3/output/x86_64-linux-gnu/bitcoin-e8c25e8a35e3-x86_64-linux-gnu-debug.tar.gz
25e48ea3a8f2d86ebea8d8ea96a902f3494197e93a65d4ff986d37506771a43a guix-build-e8c25e8a35e3/output/x86_64-linux-gnu/bitcoin-e8c25e8a35e3-x86_64-linux-gnu.tar.gz
d73e31db2488cf422704e3abf432bb430f9155b8aafd4a9a501f826785cbe1d9 guix-build-e8c25e8a35e3/output/x86_64-w64-mingw32/SHA256SUMS.part
23818afba6bbd8de1c2c2d6d6b64c05d87400d424f4c9db516b854c75b29f50a guix-build-e8c25e8a35e3/output/x86_64-w64-mingw32/bitcoin-e8c25e8a35e3-win64-debug.zip
facdda5d82b05091bb98419c7b6913e4d0019c58f4d67f95d750fc632e32c611 guix-build-e8c25e8a35e3/output/x86_64-w64-mingw32/bitcoin-e8c25e8a35e3-win64-setup-unsigned.exe
45a1252ce93fb0d8e1ebde66c16542c1bbc8b6efd6280ec7f1553415f80461fd guix-build-e8c25e8a35e3/output/x86_64-w64-mingw32/bitcoin-e8c25e8a35e3-win64-unsigned.tar.gz
8b4bc3b6cd78713e045db74eed4b3fbd711dd7e09980da386100e72dce33097e guix-build-e8c25e8a35e3/output/x86_64-w64-mingw32/bitcoin-e8c25e8a35e3-win64.zip