diff options
author | Holger Wünsche <holger.o.wuensche@t-online.de> | 2020-03-17 14:40:07 +0100 |
---|---|---|
committer | Holger Wünsche <holger.o.wuensche@t-online.de> | 2020-03-19 10:47:20 +0100 |
commit | e9aa8770ea8bd872da0d04cb98a7856ba1fc5412 (patch) | |
tree | 167f56af4a054cb63c1808acf2003279c948d096 /pkgs/development/compilers | |
parent | 0ec3f4e26b6bcc9513202f9a479c897fece9b2bb (diff) | |
download | nixpkgs-e9aa8770ea8bd872da0d04cb98a7856ba1fc5412.tar nixpkgs-e9aa8770ea8bd872da0d04cb98a7856ba1fc5412.tar.gz nixpkgs-e9aa8770ea8bd872da0d04cb98a7856ba1fc5412.tar.bz2 nixpkgs-e9aa8770ea8bd872da0d04cb98a7856ba1fc5412.tar.lz nixpkgs-e9aa8770ea8bd872da0d04cb98a7856ba1fc5412.tar.xz nixpkgs-e9aa8770ea8bd872da0d04cb98a7856ba1fc5412.tar.zst nixpkgs-e9aa8770ea8bd872da0d04cb98a7856ba1fc5412.zip |
llvmPackages_10: removed extra polly-build
There is no good reason to have separate builds for polly and no-polly versions. wwwwwThe reason for the two versions was (as far as I can tell) to defer rebuilds (see ed60483257b62c32b5b58c6e91c9c8cd586f77d0). Polly is now enabled by default.
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/llvm/10/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/10/llvm.nix | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix index 4dc41961e23..566f9742ccb 100644 --- a/pkgs/development/compilers/llvm/10/default.nix +++ b/pkgs/development/compilers/llvm/10/default.nix @@ -30,16 +30,11 @@ let in { llvm = callPackage ./llvm.nix { }; - llvm-polly = callPackage ./llvm.nix { enablePolly = true; }; clang-unwrapped = callPackage ./clang { inherit (tools) lld; inherit clang-tools-extra_src; }; - clang-polly-unwrapped = callPackage ./clang { - inherit clang-tools-extra_src; - llvm = tools.llvm-polly; - }; llvm-manpages = lowPrio (tools.llvm.override { enableManpages = true; diff --git a/pkgs/development/compilers/llvm/10/llvm.nix b/pkgs/development/compilers/llvm/10/llvm.nix index aa3668b43cf..fff80e3f814 100644 --- a/pkgs/development/compilers/llvm/10/llvm.nix +++ b/pkgs/development/compilers/llvm/10/llvm.nix @@ -17,7 +17,7 @@ , enablePFM ? !(stdenv.isDarwin || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 ) -, enablePolly ? false +, enablePolly ? true }: let |