diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-04-06 13:20:53 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-04-06 13:20:53 +0200 |
commit | 526c4292ae62e63b5711f8d112290fcd2613d8b3 (patch) | |
tree | 6173d194e626d9f23d530cdbaaadd9df674ce506 /pkgs/development/compilers/llvm | |
parent | 6fe989eaed7d283bbde7a58e42ce36c676870aee (diff) | |
parent | 6b9afd8991899e3b115cb8af5702706eb0db1933 (diff) | |
download | nixlib-526c4292ae62e63b5711f8d112290fcd2613d8b3.tar nixlib-526c4292ae62e63b5711f8d112290fcd2613d8b3.tar.gz nixlib-526c4292ae62e63b5711f8d112290fcd2613d8b3.tar.bz2 nixlib-526c4292ae62e63b5711f8d112290fcd2613d8b3.tar.lz nixlib-526c4292ae62e63b5711f8d112290fcd2613d8b3.tar.xz nixlib-526c4292ae62e63b5711f8d112290fcd2613d8b3.tar.zst nixlib-526c4292ae62e63b5711f8d112290fcd2613d8b3.zip |
Merge branch 'staging-next'
This iteration was long, about five weeks (2fcb11a2), I think. Darwin: it's missing a few thousand binaries and there's a make-netbsd regression, but I suppose these aren't merge blockers.
Diffstat (limited to 'pkgs/development/compilers/llvm')
-rw-r--r-- | pkgs/development/compilers/llvm/6/llvm.nix | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index 16a716d32fa6..1d96513a0ece 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -14,9 +14,6 @@ , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? true -# Mesa requires AMDGPU target -# BPF is used by bcc -, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform "AMDGPU" "BPF" ] }: let |