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_{7-12}.compiler-rt: install resource files to DATADIR #123103

Merged
merged 2 commits into from May 15, 2021

Commits on May 15, 2021

  1. llvmPackages_{7-12}.compiler-rt: install resource files to DATADIR

    This is in an effort to fix the following build failure shown by
    chromium:
    
        clang++: error: no such file or directory: '/nix/store/fhd89wrmkx6nflzjk0d6waz70bk3zc4i-clang-wrapper-12.0.0/resource-root/share/cfi_blacklist.txt'
    
    As it turns out a change introduced via the gnu-install-dirs.patch
    caused `add_compiler_rt_resource_file` to install resource files to
    $dev/include (FULL_INCLUDEDIR) instead of $out/share (FULL_DATADIR)
    which in turn meant that the clang wrappers we had didn't link those
    files to its resource root at all.
    
    Alternative fix to this would have been to link
    compiler-rt.dev/include/*.txt to the wrappers resource-root/share as
    well, but since this was handled inconsistently across the patch anyways
    (the dfsan list is installed correctly), opt to handle this
    consistently within the patch.
    
    llvmPackages_{5,6} install the resource files to a completely different
    location and need separate investigation.
    sternenseemann committed May 15, 2021
    Copy the full SHA
    0046076 View commit details
    Browse the repository at this point in the history
  2. llvmPackages_{7,8,9}: link ${compiler-rt.out}/share to resource root

    This is done for 10-12, but not for the earlier llvm package sets.
    sternenseemann committed May 15, 2021
    Copy the full SHA
    74f709f View commit details
    Browse the repository at this point in the history