mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 01:20:40 +00:00
Code Issues Wiki Activity

llvmPackages: select version by targetPlatform

Browse source
This commit is contained in:
Emery Hemingway 2021-01-04 11:02:13 +01:00
parent b6af78fdf5
commit ee74ca3aa6
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

@ -9946,7 +9946,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;