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

Merge master into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2015-10-23 01:57:14 +02:00
parent cf787f0282 c76f010450
commit 4917a4f8b3
247 changed files with 16829 additions and 1271 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/llvm/3.3/llvm.nix
+2 -2
View File
@@ -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 {
@@ -34,7 +34,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"
pkgs/development/compilers/llvm/3.4/llvm.nix
+2 -1
View File
@@ -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"
pkgs/development/compilers/llvm/3.5/llvm.nix
+2 -1
View File
@@ -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"
pkgs/development/compilers/llvm/3.6/llvm.nix
+2 -1
View File
@@ -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"
pkgs/development/compilers/llvm/3.7/llvm.nix
+2 -1
View File
@@ -13,6 +13,7 @@
, zlib
, libcxxabi
, compiler-rt_src
, debugVersion ? false
}:
let
@@ -40,7 +41,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"