[all-commits] [llvm/llvm-project] 5d7966: [take 2] [libc++] Include <__config_site> from <__...

Louis Dionne via All-commits all-commits at lists.llvm.org
Wed Oct 21 07:41:23 PDT 2020


  Branch: refs/heads/master
  Home:   https://github.com/llvm/llvm-project
  Commit: 5d796645d6c8cadeb003715c33e231a8ba05b6de
      https://github.com/llvm/llvm-project/commit/5d796645d6c8cadeb003715c33e231a8ba05b6de
  Author: Louis Dionne <ldionne at apple.com>
  Date:   2020-10-21 (Wed, 21 Oct 2020)

  Changed paths:
    M libcxx/CMakeLists.txt
    M libcxx/docs/TestingLibcxx.rst
    M libcxx/include/CMakeLists.txt
    M libcxx/include/__config
    M libcxx/test/configs/legacy.cfg.in
    M libcxx/utils/libcxx/test/config.py
    M libcxxabi/CMakeLists.txt
    M libcxxabi/src/CMakeLists.txt
    M libcxxabi/test/libcxxabi/test/config.py
    M libcxxabi/test/lit.site.cfg.in
    M libunwind/test/libunwind/test/config.py

  Log Message:
  -----------
  [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
hand.

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




More information about the All-commits mailing list