Skip to content
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

llvmPackages_{15}.libcxxStdenv: fix '__cxxabi_config.h' file not found #255756

Closed
wants to merge 2 commits into from

Commits on Sep 17, 2023

  1. tests.cc-wrapper.supported: add test for cxxabi header

    `#include <cxxabi.h>`
    
    `/nix/store/02wpjmp2zjjxz13z7g599mniwi25zkcy-libcxxabi-16.0.6-dev/include/cxxabi.h:20:10: fatal error: '__cxxabi_config.h' file not found`
    Artturin committed Sep 17, 2023
    Configuration menu
    Copy the full SHA
    14228d9 View commit details
    Browse the repository at this point in the history
  2. llvmPackages_15.libcxx: specify `LIBCXX_CXX_ABI_{LIBRARY_PATH,INCLUDE…

    …_PATHS}` for all cxxabis
    
    Previously we only specified `LIBCXX_CXX_ABI_INCLUDE_PATHS` for
    `libcxxabi` and not for `libcxxrt` which causes `libcxx`'s build to
    fall back to looking in `/usr/include/c++/v1`: https://github.com/llvm/llvm-project/blob/aa656f6c2dec73faceeed21e15401d8f0c743c8b/libcxx/cmake/Modules/HandleLibCXXABI.cmake#L148-L151
    
    We didn't set `LIBCXX_CXX_ABI_LIBRARY_PATH` (and this did not seem to be
    a problem; I think this gets defaulted elsewhere in the `libcxx` build)
    but it doesn't hurt to.
    rrbutani authored and Artturin committed Sep 17, 2023
    Configuration menu
    Copy the full SHA
    15f63a7 View commit details
    Browse the repository at this point in the history