From 3054cbd3f2d80ba04bd7142bbff122d314c8c167 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 13 Jan 2019 20:53:21 -0600 Subject: [PATCH 1/2] llvm: include BPF target too, otherwise can't build bcc --- pkgs/development/compilers/llvm/7/llvm.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index 6253162f254..fa325271876 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -15,7 +15,8 @@ , enableManpages ? false , enableSharedLibraries ? true # Mesa requires AMDGPU target -, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform "AMDGPU" ] +# BPF is used by bcc +, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform "AMDGPU" "BPF" ] , enablePFM ? !stdenv.isDarwin }: From 5e2ac7e5fd246dfca0ec403617f27ec68a4a24ac Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 13 Jan 2019 20:54:41 -0600 Subject: [PATCH 2/2] llvm6: enable BPF target here as well --- pkgs/development/compilers/llvm/6/llvm.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index 54617a07573..4d8666a60cb 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -13,9 +13,10 @@ , fetchpatch , debugVersion ? false , enableManpages ? false -# Mesa requires AMDGPU target -, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform "AMDGPU" ] , enableSharedLibraries ? true +# Mesa requires AMDGPU target +# BPF is used by bcc +, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform "AMDGPU" "BPF" ] }: let