Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: ec10b0958d01
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 91cba7b0a984
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on May 15, 2021

  1. llvmPackages_{10,11,12}.compiler-rt: install resource txts to $out/share 

    7869d16 changed how resource files are
installed. Likely by accident, now some of the resource files are
installed to $dev/include instead of $out/share. This causes the cc
wrapper's resource-root to miss those files from compiler-rt as they are
in a different place than expected.

This commit fixes all instances of this incorrect installation for
llvmPackages_10, 11 and 12 which are the only llvm package sets which
link ${targetLlvmLibraries.compiler-rt.out}/share to the resource-root.

For the other llvm package set this will likely also need to be fixed,
but it doesn't have to have immediate urgency and doing it in two steps
allows us to (hopefully) fix the chromium build without causing a darwin
stdenv rebuild.

The full fix can be found in #123103 and should probably be included in
the next staging-next rotation.
    @sternenseemann
    sternenseemann committed May 15, 2021
    Configuration menu
    Copy the full SHA
    91cba7b View commit details
    Browse the repository at this point in the history