diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-02-05 14:27:21 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-02-05 14:27:32 +0100 |
| commit | c8ce2632ebff53aea721301b87b48ed1f98c40d4 (patch) | |
| tree | 850a4d95bc6dc3bb69703ff8f7bb3c6b3a309a06 /contrib/gitian-build.py | |
| parent | 01668839de3693736c29be61c4330aea00bb0136 (diff) | |
| parent | 7e2104433cd0905ccf94632511b3ca0ce5b0463b (diff) | |
| download | bitcoin-c8ce2632ebff53aea721301b87b48ed1f98c40d4.tar.xz | |
Merge #16392: build: macOS toolchain update
7e2104433cd0905ccf94632511b3ca0ce5b0463b build: use macOS 10.14 SDK (fanquake)
ca5055a5aa07aba81a87cf12f6f0526a63c423b5 depends: native_cctools 921, ld64 409.12, libtapi 1000.10.8 (fanquake)
1de8c067c74cd171144c8a900a8a20efe3072c43 depends: clang 6.0.1 (fanquake)
Pull request description:
TLDR: This updates our macOS toolchain to use a newer version of Clang, cctools (including new [dependency on libtapi](https://github.com/tpoechtrager/cctools-port/tree/master#dependencies)), LD64 and the macOS SDK.
I've been testing depends builds (`HOST=x86_64-apple-darwin16`) inside a Debian Buster [Docker container](https://github.com/fanquake/core-review/blob/master/docker/debian.dockerfile), and running the resultant `bitcoind` and `bitcoin-qt` binaries on a macOS `10.14.4` system. The `.dmg` generated by a `make deploy` also mounts correctly on the same macOS system.
#### Clang
Upgraded from `3.7.1` to [`6.0.1`](https://releases.llvm.org/6.0.1/docs/ReleaseNotes.html)
#### cctools
* cctools `877.8` -> [`921`](https://opensource.apple.com/tarballs/cctools/)
* LD64 `253.9` -> [`409.12`](https://opensource.apple.com/source/ld64/)
* TAPI [`1000.10.8`](https://opensource.apple.com/tarballs/tapi/)
See [tpoechtrager/cctools-port](https://github.com/tpoechtrager/cctools-port/) and [tpoechtrager/apple-libtapi](https://github.com/tpoechtrager/apple-libtapi/).
#### macOS SDK
Upgraded from building against the macOS `10.11` SDK to the macOS `10.14` SDK.
#### TODO
- [x] Make the `10.14` SDK available to Travis.
Fixes: #16052
Closes: #14797
ACKs for top commit:
Sjors:
re-ACK 7e2104433cd0905ccf94632511b3ca0ce5b0463b (rebased from 248526e)
dongcarl:
ACK 7e21044
Tree-SHA512: fd36a33dbfb98c144240f8c69b77343e3f5bc18d8cf7d40fff61f51ad48925ec1872e6daba34c4045b18b4c2c84c22c744ebf4cba11061a0305eed13975ceefe
Diffstat (limited to 'contrib/gitian-build.py')
| -rwxr-xr-x | contrib/gitian-build.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/gitian-build.py b/contrib/gitian-build.py index ade9e00d1b..4a3df93cea 100755 --- a/contrib/gitian-build.py +++ b/contrib/gitian-build.py @@ -209,7 +209,7 @@ def main(): args.macos = 'm' in args.os # Disable for MacOS if no SDK found - if args.macos and not os.path.isfile('gitian-builder/inputs/MacOSX10.11.sdk.tar.gz'): + if args.macos and not os.path.isfile('gitian-builder/inputs/MacOSX10.14.sdk.tar.gz'): print('Cannot build for MacOS, SDK does not exist. Will build for other OSes') args.macos = False |