From e2e4e59975b0022c72d03a74a68f9ab8a4da10a2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 3 Oct 2015 14:16:41 +0300 Subject: [PATCH] llvm: add debug builds support --- pkgs/development/compilers/llvm/3.3/llvm.nix | 4 ++-- pkgs/development/compilers/llvm/3.4/llvm.nix | 3 ++- pkgs/development/compilers/llvm/3.5/llvm.nix | 3 ++- pkgs/development/compilers/llvm/3.6/llvm.nix | 3 ++- pkgs/development/compilers/llvm/3.7/llvm.nix | 3 ++- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.3/llvm.nix b/pkgs/development/compilers/llvm/3.3/llvm.nix index 8dca8b43bc2..37e85b55a53 100644 --- a/pkgs/development/compilers/llvm/3.3/llvm.nix +++ b/pkgs/development/compilers/llvm/3.3/llvm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, groff, cmake, python, libffi, binutils }: +{ stdenv, fetchurl, perl, groff, cmake, python, libffi, binutils, debugVersion ? false }: let version = "3.3"; in stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { in "export ${LD}_LIBRARY_PATH='$$${LD}_LIBRARY_PATH:'`pwd`/lib"; cmakeFlags = with stdenv; [ - "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_BINUTILS_INCDIR=${binutils}/include" diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 4c9235681e3..59e8055efb2 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -12,6 +12,7 @@ , version , zlib , compiler-rt_src +, debugVersion ? false }: let @@ -41,7 +42,7 @@ in stdenv.mkDerivation rec { ''; cmakeFlags = with stdenv; [ - "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_REQUIRES_RTTI=1" diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index 395843bf0d8..8daba7b1d9c 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -12,6 +12,7 @@ , version , zlib , compiler-rt_src +, debugVersion ? false }: let @@ -38,7 +39,7 @@ in stdenv.mkDerivation rec { ''; cmakeFlags = with stdenv; [ - "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_REQUIRES_RTTI=1" diff --git a/pkgs/development/compilers/llvm/3.6/llvm.nix b/pkgs/development/compilers/llvm/3.6/llvm.nix index d757b9314c3..6da31fbbf5b 100644 --- a/pkgs/development/compilers/llvm/3.6/llvm.nix +++ b/pkgs/development/compilers/llvm/3.6/llvm.nix @@ -12,6 +12,7 @@ , version , zlib , compiler-rt_src +, debugVersion ? false }: let @@ -38,7 +39,7 @@ in stdenv.mkDerivation rec { ''; cmakeFlags = with stdenv; [ - "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix index 4ff61b27878..62245b479f5 100644 --- a/pkgs/development/compilers/llvm/3.7/llvm.nix +++ b/pkgs/development/compilers/llvm/3.7/llvm.nix @@ -12,6 +12,7 @@ , version , zlib , compiler-rt_src +, debugVersion ? false }: let @@ -38,7 +39,7 @@ in stdenv.mkDerivation rec { ''; cmakeFlags = with stdenv; [ - "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON"