public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

llvmPackages_12: Add recurseIntoAttrs

Browse Source 
See #115288 (835a8f1cbc5). This was missing for LLVM 12 because both
changes where made in parallel.
This commit is contained in:
Michael Weiss 2021-04-01 20:11:15 +02:00
parent dc8a72ea6d
commit 53fd303d0e
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/top-level/all-packages.nix
View File

@ -10894,13 +10894,13 @@ in
stdenv = gcc7Stdenv; stdenv = gcc7Stdenv;
})); }));
llvmPackages_12 = callPackage ../development/compilers/llvm/12 ({ llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 ({
inherit (stdenvAdapters) overrideCC; inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_12.tools; buildLlvmTools = buildPackages.llvmPackages_12.tools;
targetLlvmLibraries = targetPackages.llvmPackages_12.libraries; targetLlvmLibraries = targetPackages.llvmPackages_12.libraries;
} // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) {
stdenv = gcc7Stdenv; stdenv = gcc7Stdenv;
}); }));
llvmPackages_latest = llvmPackages_11; llvmPackages_latest = llvmPackages_11;