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

stdenv.adapters: fix overrideLibcxx to refer to existing `compiler… #279463

Merged
merged 1 commit into from Jan 10, 2024

Conversation

trofi
Copy link
Contributor

@trofi trofi commented Jan 7, 2024

…-rt`

Before the change pkgsLLVM attributes were failing to pull in compiler-rt on x86_64-linux:

$ nix build --no-link -f. pkgsLLVM.asciidoc-full
error:
   error: attribute 'llvmPackages_13' missing

   at pkgs/stdenv/adapters.nix:86:32:

       85|       inherit libcxx;
       86|       extraPackages = [ cxxabi pkgs.pkgsTargetTarget."llvmPackages_${lib.versions.major llvmLibcxxVersion}".compiler-rt ];
         |                                ^
       87|     });

It happens because pkgs.pkgsTargetTarget are always empty for cross-packages like pkgsLLVM., pkgsCross.*. or --arg crossSystem '...'.

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

…-rt`

Before the change `pkgsLLVM` attributes were failing to pull in
`compiler-rt` on `x86_64-linux`:

    $ nix build --no-link -f. pkgsLLVM.asciidoc-full
    error:
       error: attribute 'llvmPackages_13' missing

       at pkgs/stdenv/adapters.nix:86:32:

           85|       inherit libcxx;
           86|       extraPackages = [ cxxabi pkgs.pkgsTargetTarget."llvmPackages_${lib.versions.major llvmLibcxxVersion}".compiler-rt ];
             |                                ^
           87|     });

It happens because `pkgs.pkgsTargetTarget` are always empty for
cross-packages like `pkgsLLVM.`, `pkgsCross.*.` or
`--arg crossSystem '...'`.
@github-actions github-actions bot added the 6.topic: stdenv Standard environment label Jan 7, 2024
@wegank wegank merged commit df865c6 into NixOS:master Jan 10, 2024
21 checks passed
@trofi trofi deleted the stdenv.adapters-fix-overrideLibcxx-cross branch January 10, 2024 18:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants