[take 2] [libc++] Include <__config_site> from <__config>

Authored by ldionne on Jun 26 2020, 9:08 AM.


[take 2] [libc++] Include <config_site> from <config>

Prior to this patch, we would generate a fancy <config> header by
concatenating <
config_site> and <__config>. This complexifies the
build system and also increases the difference between what's tested
and what's actually installed.

This patch removes that complexity and instead simply installs <config_site>
alongside the libc++ headers. <
config_site> is then included by <config>,
which is much simpler. Doing this also opens the door to having different
config_site> headers depending on the target, which was impossible before.

It does change the workflow for testing header-only changes to libc++.
Previously, we would run lit against the headers in libcxx/include.
After this patch, we run it against a fake installation root of the
headers (containing a proper <__config_site> header). This makes use
closer to testing what we actually install, which is good, however it
does mean that we have to update that root before testing header changes.
Thus, we now need to run ninja check-cxx-deps before running lit by

This commit was originally applied in 1e46d1aa3 and reverted in eb60c487
because it broke the libc++abi and libunwind test suites. This has now
been fixed.

Differential Revision: https://reviews.llvm.org/D89041


ldionneOct 21 2020, 7:40 AM
Differential Revision
D89041: [libc++] Include <__config_site> from <__config>
rG26459e6d8eeb: Fix "Unknown arguments specified" to if in lldb