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

LLVM: Allow building gold plugins together with llvm 3.{1,2}.

This commit is contained in:
Vladimir Still 2014-01-26 22:53:27 +01:00
parent 69af3f4a78
commit 3209170626
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/compilers/llvm/3.1/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, groff, cmake, python }: { stdenv, fetchurl, perl, groff, cmake, python, binutils }:
let version = "3.1"; in let version = "3.1"; in
@ -12,7 +12,10 @@ stdenv.mkDerivation {
buildInputs = [ perl groff cmake python ]; buildInputs = [ perl groff cmake python ];
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DLLVM_BINUTILS_INCDIR=${binutils}/include"
];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -20,7 +23,7 @@ stdenv.mkDerivation {
homepage = http://llvm.org/; homepage = http://llvm.org/;
description = "Collection of modular and reusable compiler and toolchain technologies"; description = "Collection of modular and reusable compiler and toolchain technologies";
license = "BSD"; license = "BSD";
maintainers = with stdenv.lib.maintainers; [viric shlevy raskin]; maintainers = with stdenv.lib.maintainers; [viric shlevy raskin vlstill];
platforms = with stdenv.lib.platforms; all; platforms = with stdenv.lib.platforms; all;
}; };
} }

10
pkgs/development/compilers/llvm/3.2/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, groff, cmake, python, libffi }: { stdenv, fetchurl, perl, groff, cmake, python, libffi, binutils }:
let version = "3.2"; in let version = "3.2"; in
@ -21,7 +21,11 @@ stdenv.mkDerivation {
# created binaries need to be run before installation... I coudn't find a better way # created binaries need to be run before installation... I coudn't find a better way
preBuild = ''export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/lib''; preBuild = ''export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/lib'';
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_SHARED_LIBS=ON" ]; cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DBUILD_SHARED_LIBS=ON"
"-DLLVM_BINUTILS_INCDIR=${binutils}/include"
];
enableParallelBuilding = true; enableParallelBuilding = true;
#doCheck = true; # tests are broken, don't know why #doCheck = true; # tests are broken, don't know why
@ -30,7 +34,7 @@ stdenv.mkDerivation {
homepage = http://llvm.org/; homepage = http://llvm.org/;
description = "Collection of modular and reusable compiler and toolchain technologies"; description = "Collection of modular and reusable compiler and toolchain technologies";
license = "BSD"; license = "BSD";
maintainers = with stdenv.lib.maintainers; [viric shlevy raskin]; maintainers = with stdenv.lib.maintainers; [viric shlevy raskin vlstill];
platforms = with stdenv.lib.platforms; all; platforms = with stdenv.lib.platforms; all;
}; };
} }