From 3209170626f760d0c093969ccbadabca475b9d62 Mon Sep 17 00:00:00 2001 From: Vladimir Still Date: Sun, 26 Jan 2014 22:53:27 +0100 Subject: [PATCH] LLVM: Allow building gold plugins together with llvm 3.{1,2}. --- pkgs/development/compilers/llvm/3.1/default.nix | 9 ++++++--- pkgs/development/compilers/llvm/3.2/default.nix | 10 +++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.1/default.nix b/pkgs/development/compilers/llvm/3.1/default.nix index 204c080b871..81c0dea97c5 100644 --- a/pkgs/development/compilers/llvm/3.1/default.nix +++ b/pkgs/development/compilers/llvm/3.1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, groff, cmake, python }: +{ stdenv, fetchurl, perl, groff, cmake, python, binutils }: let version = "3.1"; in @@ -12,7 +12,10 @@ stdenv.mkDerivation { buildInputs = [ perl groff cmake python ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DLLVM_BINUTILS_INCDIR=${binutils}/include" + ]; enableParallelBuilding = true; @@ -20,7 +23,7 @@ stdenv.mkDerivation { homepage = http://llvm.org/; description = "Collection of modular and reusable compiler and toolchain technologies"; 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; }; } diff --git a/pkgs/development/compilers/llvm/3.2/default.nix b/pkgs/development/compilers/llvm/3.2/default.nix index 59e2bdc5509..e29722f3ca9 100644 --- a/pkgs/development/compilers/llvm/3.2/default.nix +++ b/pkgs/development/compilers/llvm/3.2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, groff, cmake, python, libffi }: +{ stdenv, fetchurl, perl, groff, cmake, python, libffi, binutils }: 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 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; #doCheck = true; # tests are broken, don't know why @@ -30,7 +34,7 @@ stdenv.mkDerivation { homepage = http://llvm.org/; description = "Collection of modular and reusable compiler and toolchain technologies"; 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; }; }