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

Merge pull request #107594 from ehmry/stdenv-cross-llvm

Browse Source 
Synchronize cross-stdenv LLVM input with pkgs.llvmPackages
This commit is contained in:
John Ericson 2021-01-10 14:51:52 -05:00 committed by GitHub
commit 5114061fa1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/stdenv/cross/default.nix
View File

@ -66,7 +66,7 @@ in lib.init bootStages ++ [
else if crossSystem.isDarwin
then buildPackages.llvmPackages.clang
else if crossSystem.useLLVM or false
then buildPackages.llvmPackages_8.lldClang
then buildPackages.llvmPackages.lldClang
else buildPackages.gcc;
extraNativeBuildInputs = old.extraNativeBuildInputs

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

@ -10032,7 +10032,17 @@ in
llvm_6 = llvmPackages_6.llvm;
llvm_5 = llvmPackages_5.llvm;
llvmPackages = recurseIntoAttrs llvmPackages_7;
llvmPackages = recurseIntoAttrs (with targetPlatform;
if isDarwin then
llvmPackages_7
else if isFreeBSD then
llvmPackages_7
else if isLinux then
llvmPackages_7
else if isWasm then
llvmPackages_8
else
llvmPackages_latest);
llvmPackages_5 = callPackage ../development/compilers/llvm/5 {
inherit (stdenvAdapters) overrideCC;