Merge pull request #107594 from ehmry/stdenv-cross-llvm
Synchronize cross-stdenv LLVM input with pkgs.llvmPackages
This commit is contained in:
commit
5114061fa1
@ -66,7 +66,7 @@ in lib.init bootStages ++ [
|
|||||||
else if crossSystem.isDarwin
|
else if crossSystem.isDarwin
|
||||||
then buildPackages.llvmPackages.clang
|
then buildPackages.llvmPackages.clang
|
||||||
else if crossSystem.useLLVM or false
|
else if crossSystem.useLLVM or false
|
||||||
then buildPackages.llvmPackages_8.lldClang
|
then buildPackages.llvmPackages.lldClang
|
||||||
else buildPackages.gcc;
|
else buildPackages.gcc;
|
||||||
|
|
||||||
extraNativeBuildInputs = old.extraNativeBuildInputs
|
extraNativeBuildInputs = old.extraNativeBuildInputs
|
||||||
|
@ -10032,7 +10032,17 @@ in
|
|||||||
llvm_6 = llvmPackages_6.llvm;
|
llvm_6 = llvmPackages_6.llvm;
|
||||||
llvm_5 = llvmPackages_5.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 {
|
llvmPackages_5 = callPackage ../development/compilers/llvm/5 {
|
||||||
inherit (stdenvAdapters) overrideCC;
|
inherit (stdenvAdapters) overrideCC;
|
||||||
|
Loading…
Reference in New Issue
Block a user