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

llvm-3.6 packages: Build everything (except clang and llvm) with clang

Browse Source
This commit is contained in:
Shea Levy
2015-03-07 13:08:34 +00:00
parent b37fd11351
commit e57e44f867
3 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/compilers/llvm/3.6/default.nix
View File

@@ -1,6 +1,6 @@
{ pkgs, newScope, stdenv, isl, fetchurl }:
{ pkgs, newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }:
let
callPackage = newScope (self // { inherit stdenv isl version fetch; });
callPackage = newScope (self // { inherit isl version fetch; });
version = "3.6.0";
@@ -15,17 +15,21 @@ let
self = {
llvm = callPackage ./llvm.nix {
inherit compiler-rt_src;
inherit compiler-rt_src stdenv;
};
clang = callPackage ./clang {
inherit clang-tools-extra_src;
clang-unwrapped = callPackage ./clang {
inherit clang-tools-extra_src stdenv;
};
clang = wrapCC self.clang-unwrapped;
stdenv = overrideCC stdenv self.clang;
lldb = callPackage ./lldb.nix {};
libcxx = callPackage ./libc++ { stdenv = pkgs.clangStdenv; };
libcxx = callPackage ./libc++ {};
libcxxabi = callPackage ./libc++abi.nix { stdenv = pkgs.clangStdenv; };
libcxxabi = callPackage ./libc++abi.nix {};
};
in self

4
pkgs/development/compilers/llvm/3.6/lldb.nix
View File

@@ -7,7 +7,7 @@
, which
, libedit
, llvm
, clang
, clang-unwrapped
, python
, version
}:
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
"-DCMAKE_BUILD_TYPE=Release"
"-DCMAKE_CXX_FLAGS=-std=c++11"
"-DLLDB_PATH_TO_LLVM_BUILD=${llvm}"
"-DLLDB_PATH_TO_CLANG_BUILD=${clang}"
"-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}"
];
enableParallelBuilding = true;