diff options
| author | fanquake <fanquake@gmail.com> | 2021-03-31 08:27:16 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-03-31 08:27:35 +0800 |
| commit | 1a0d1452a0abf203c92aa8faa6963349c15addb4 (patch) | |
| tree | 4bd71012f379ed9f90fa5684301e00fea7d3e85d /.cirrus.yml | |
| parent | 267b60f800cb298d6700ae54fdace595c0e80313 (diff) | |
| parent | 765e0be5347e9d85cee03255204d94119e4cbf38 (diff) | |
| download | bitcoin-1a0d1452a0abf203c92aa8faa6963349c15addb4.tar.xz | |
Merge #21457: build: split libtapi and clang out of native_cctools
765e0be5347e9d85cee03255204d94119e4cbf38 build: split native_cctools (fanquake)
Pull request description:
This splits our native cctools package into two additional packages: `native_clang` and `native_libtapi`. This is in an effort to not only make our mac toolchain more understandable, but also to reduce duplication, and as a nice side-effect, fix the issue mentioned [here](https://github.com/bitcoin/bitcoin/pull/19817#issuecomment-741763289).
Everything about the current build process should remain the same. For gitian, that is:
* Download LLVM Clang 8.0.0 binary.
* Build libtapi using downloaded Clang.
* Build cctools using downloaded Clang and libtapi.
* Build the rest of depends..
For Guix (`FORCE_USE_SYSTEM_CLANG=1`):
* Build libtapi using using system Clang.
* Build cctools using system Clang and libtapi.
* Build the rest of depends..
After this has been merged, my plan is to combine a modified version of #20454 and #21414 with #19817, and from what I understand that will be enough to support Apple Arm cross compilation.
Builds at 477ed59f49f39ae4272219a1216ee19fb72fdde5:
Guix:
```bash
find output -type f -name *$(git rev-parse --short HEAD)*.* -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
7e57b9e5a2109d1a35f0091d86f975c1b1d73ac70ac2609cefbe1134efbf2c87 output/bitcoin-477ed59f49f3-osx-unsigned.dmg
dd11e71c2634ac2fa883d1e45cbd6de194fad37624bb56b8b8a6213fd40d6050 output/bitcoin-477ed59f49f3-osx-unsigned.tar.gz
64384eaa2fd9768992d86a06a1414c9e92e84ba21a875696483df2bb5828e2a2 output/bitcoin-477ed59f49f3-osx64.tar.gz
8a889e88db952d2c82ef44713c04aba95b777441f578738ff6d8a0d251e51da3 output/src/bitcoin-477ed59f49f3.tar.gz
```
Gitian:
```bash
d0eee8542d5f3d662555ad7218d2dc9f3f862656e65bcb2f01f256bfa0deead2 bitcoin-477ed59f49f3-osx-unsigned.dmg
ba7bc94897e42e7a037e352c4e4e1730f181c6d76b6d6a2785bbd7bf85614c83 bitcoin-477ed59f49f3-osx-unsigned.tar.gz
c4426d1d310a2fbffcaf2b7df0da4ec97bd11aab07085006dae68777b03f6372 bitcoin-477ed59f49f3-osx64.tar.gz
8a889e88db952d2c82ef44713c04aba95b777441f578738ff6d8a0d251e51da3 src/bitcoin-477ed59f49f3.tar.gz
a746831467dc8ff17ec5df06fc9288a859c1961d8c0b632d97b42f080dbd825d bitcoin-core-osx-22-res.yml
```
ACKs for top commit:
dongcarl:
reACK 765e0be5347e9d85cee03255204d94119e4cbf38
hebasto:
ACK 765e0be5347e9d85cee03255204d94119e4cbf38, verified building of the `native_cctools` package step-by-step.
Tree-SHA512: 61cf2b092fb8b9724adda1084e0cac9db889cd5e391914b43592aebc470fae3c1cbabc8b59a0abce6e7bad8c646694fe927f26f4deb18b60d7fd92f374f62feb
Diffstat (limited to '.cirrus.yml')
0 files changed, 0 insertions, 0 deletions