public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

afl: use clangStdenv

Browse Source 
Fixes #28712
This commit is contained in:
Daiderd Jordan 2017-09-05 21:59:43 +02:00
parent 0adb83e2a2
commit 8706664ff6
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/security/afl/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, bash, callPackage, makeWrapper { stdenv, fetchurl, bash, callPackage, makeWrapper
, clang, llvm, which, libcgroup }: , clang, llvm, which, libcgroup
}:
let let
afl-qemu = callPackage ./qemu.nix {}; afl-qemu = callPackage ./qemu.nix {};
@ -7,6 +8,7 @@ let
else if stdenv.system == "i686-linux" then "qemu-i386" else if stdenv.system == "i686-linux" then "qemu-i386"
else throw "afl: no support for ${stdenv.system}!"; else throw "afl: no support for ${stdenv.system}!";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "afl-${version}"; name = "afl-${version}";
version = "2.48b"; version = "2.48b";
@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
buildPhase = '' buildPhase = ''
make PREFIX=$out make PREFIX=$out
cd llvm_mode cd llvm_mode
make PREFIX=$out CC=${clang}/bin/clang CXX=${clang}/bin/clang++ make PREFIX=$out
cd .. cd ..
''; '';
installPhase = '' installPhase = ''

4
pkgs/top-level/all-packages.nix
View File

@ -396,7 +396,9 @@ with pkgs;
afio = callPackage ../tools/archivers/afio { }; afio = callPackage ../tools/archivers/afio { };
afl = callPackage ../tools/security/afl { }; afl = callPackage ../tools/security/afl {
stdenv = clangStdenv;
};
afpfs-ng = callPackage ../tools/filesystems/afpfs-ng/default.nix { }; afpfs-ng = callPackage ../tools/filesystems/afpfs-ng/default.nix { };