-
Notifications
You must be signed in to change notification settings - Fork 37.3k
depends: Allow building with system clang #17919
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
depends: Allow building with system clang #17919
Conversation
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsReviewers, this pull request conflicts with the following ones:
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. |
wen rebase, sir? |
To give some context, I am still running into issues cross-compiling for mac on non-x86 arch. So I am hoping that this pull improves it for me.
|
c8926fe
to
39da707
Compare
Rebased over #18072 and updated PR description. |
@MarcoFalke This will definitely improve the situation for you (as I think the error you encounter is because we download a clang from llvm.org that's meant to be run on an x86_64 machine), but not sure if it will solve everything. |
c111d32
to
bb5f90c
Compare
Rebased over #19240 and made some simplifications. I think it's ready for review! |
Looks like travis may be unable to compile mac depends, but the depends stderr is not shown. See #16368 (comment) |
I think it's cuz we need the regenerated macOS SDK with the libc++ headers |
bb5f90c
to
13450e3
Compare
Concept ACK and this looks to be in good shape once rebased on top of feedback/fixups in #19240. The changes in native_cctools.mk are pretty ugly but straightforward, and current behavior is unchanged as long as FORCE_USE_SYSTEM_CLANG remains unused. Though I think @dongcarl has finally convinced me that we'll probably move on to system-clang by default at some point and drop our weird pinned one. So hopefully the ugliness is only temporary. Well done! |
Travis should be able to find MacOSX10.14-with-libcxx-headers.sdk.tar.gz now :) |
Given that we are going to be using a system Clang, I had a bit of a look into what patching Ubuntu and Guix are doing with their Clang packages to see if there was anything we needed to consider; i.e similar to #18921. GuixThe Clang and LLVM patches are here. They seem fairly mundane. Mostly adjusting include/search paths, and fixing sanitizer build & ABI related issues. Ubuntu/DebianFor Clang 6.0, the most macOS related patch seems to be silent-test-macho.diff. Looks like it deletes one of the tests for For Clang-10, one additional macOS related patch has landed, which removes macOS specific info, i.e |
6110cb3
to
9fe0da8
Compare
There's no issue, but it was discussed offline IIRC. I'll mention it in #19683, as I think documenting it as part of those changes is probably the easiest thing to do right now. |
Summary: ``` This patchset allows us to force depends to use system clang. Previously, #17099 removes our dependency on a specific clang we download from llvm.org, but theuni pointed out that since OSX builds are only ever built with a version of clang that is chosen and "blessed" by Apple, it is more likely that the user will encounter problems if they use their system clang. This patchset forces the user to set FORCE_USE_SYSTEM_CLANG=1 in order to use their system clang (when they know what they're doing) ``` Backport of core [[bitcoin/bitcoin#17919 | PR17919]]. Test Plan: make FORCE_USE_SYSTEM_CLANG=1 build-osx Note that this diff isn't enough to cross build OSX with the system clang as the toolchain file will redirect the binutils to the ones from the depends. Reviewers: #bitcoin_abc, deadalnix Reviewed By: #bitcoin_abc, deadalnix Subscribers: deadalnix Differential Revision: https://reviews.bitcoinabc.org/D7755
e1b89ac Fix QPainter non-determinism on macOS (Andrew Chow) 831c317 macOS deploy: use the new plistlib API (Jonas Schnelli) 5857aaf doc: Document ALLOW_HOST_PACKAGES dependency option (skmcontrib) 2329e08 build: Fix behavior when ALLOW_HOST_PACKAGES unset (Hennadii Stepanov) 1768870 depends: native_ds_store 1.3.0 (fanquake) 3f9f3e5 depends: pull upstream libdmg-hfsplus changes (fanquake) f7606dc depends: latest config.guess & config.sub (fanquake) cc3ae74 depends: bump native_cctools for fixed lto with external clang (Cory Fields) b26c648 depends: enable lto support for Apple's ld64 (Cory Fields) 50933d7 depends: Add documentation for FORCE_USE_SYSTEM_CLANG make flag (Carl Dong) ba3ddf2 depends: Reformat make options as definition list (Carl Dong) 3b855a7 depends: Add justifications for macOS clang flags (Carl Dong) 4104de0 depends: specify libc++ header location for darwin (Cory Fields) cd4335f depends: force a new host id string if FORCE_USE_SYSTEM_CLANG is in use (Cory Fields) d30e1af depends: Allow building with system clang (Carl Dong) 234828b depends: Decouple toolchain + binutils (Carl Dong) 1dd3a5a doc: explain why passing -mlinker-version is required (fanquake) 5cc0d0f darwin: pass mlinker-version so that clang enables new features (Cory Fields) 813a552 macos: Bump to xcode 11.3.1 and 10.15 SDK (Cory Fields) ee7085f depends: bump MacOS toolchain (Cory Fields) e5b092b contrib: macdeploy: Remove historical extraction notes (Carl Dong) 5893caf contrib: macdeploy: Use apple-sdk-tools instead of xar+pbzx (Carl Dong) 9f2d4ba native_cctools: Don't use libc++ from pinned clang (Carl Dong) 0c8d217 Adapt rest of tooling to new SDK naming scheme (Carl Dong) bdacfa8 contrib: macdeploy: Correctly generate macOS SDK (Carl Dong) f7eee2c Fix naming of macOS SDK and clarify version (Andrew Chow) 62f9e23 build: use macOS 10.14 SDK (fanquake) bc2e1af depends: native_cctools 921, ld64 409.12, libtapi 1000.10.8 (fanquake) a296d87 depends: clang 6.0.1 (fanquake) 8f6c475 build: Set minimum supported macOS to 10.12 (Fuzzbawls) Pull request description: This backports the following upstream PRs to update the macOS cross-compiling tools: bitcoin#17550 bitcoin#16392 bitcoin#18589 bitcoin#19240 bitcoin#19407 bitcoin#17919 bitcoin#19530 bitcoin#17057 bitcoin#20333 bitcoin#18051 bitcoin#19124 bitcoin#20298 bitcoin#20447 The tools being updated are ### Clang Upgraded from `3.7.1` to `8.0.0` ### cctools * cctools `877.8` -> `949.0.1` * LD64 `253.9` -> `530` * TAPI `1000.10.8` ### DSStore Upgraded from `1.1.2` to `1.3.0` (this removes the biplist dependency) This also effectively bumps our minimum supported macOS version to 10.12 (Sierra). ACKs for top commit: furszy: tested ACK e1b89ac random-zebra: utACK e1b89ac Tree-SHA512: f5cec8db57e07d8855070646b9e1400d48aac1d01e3c2c3b3e134665c6372d6535f3328888bb9a75087f7b3d5231ecb4b509723bfa51bd40770ffe2810c67f65
This replaces: #17099
This patchset allows us to force depends to use system clang.
Previously, #17099 removes our dependency on a specific clang we download from llvm.org, but theuni pointed out that since OSX builds are only ever built with a version of clang that is chosen and "blessed" by Apple, it is more likely that the user will encounter problems if they use their system clang. This patchset forces the user to set
FORCE_USE_SYSTEM_CLANG=1
in order to use their system clang (when they know what they're doing)