nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-02 07:31:26 +00:00
Code Issues 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
Show Stats 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 let
callPackage = newScope (self // { inherit stdenv isl version fetch; }); callPackage = newScope (self // { inherit isl version fetch; });
version = "3.6.0"; version = "3.6.0";
@ -15,17 +15,21 @@ let
self = { self = {
llvm = callPackage ./llvm.nix { llvm = callPackage ./llvm.nix {
inherit compiler-rt_src; inherit compiler-rt_src stdenv;
}; };
clang = callPackage ./clang { clang-unwrapped = callPackage ./clang {
inherit clang-tools-extra_src; inherit clang-tools-extra_src stdenv;
}; };
clang = wrapCC self.clang-unwrapped;
stdenv = overrideCC stdenv self.clang;
lldb = callPackage ./lldb.nix {}; 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 in self

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

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

15
pkgs/top-level/all-packages.nix
View File

@ -3203,9 +3203,9 @@ let
ccl = callPackage ../development/compilers/ccl { }; ccl = callPackage ../development/compilers/ccl { };
clang = wrapCC llvmPackages.clang; clang = llvmPackages.clang;
clang_36 = wrapCC llvmPackages_36.clang; clang_36 = llvmPackages.clang;
clang_35 = wrapCC llvmPackages_35.clang; clang_35 = wrapCC llvmPackages_35.clang;
clang_34 = wrapCC llvmPackages_34.clang; clang_34 = wrapCC llvmPackages_34.clang;
clang_33 = wrapCC (clangUnwrapped llvm_33 ../development/compilers/llvm/3.3/clang.nix); clang_33 = wrapCC (clangUnwrapped llvm_33 ../development/compilers/llvm/3.3/clang.nix);
@ -3233,8 +3233,8 @@ let
}; };
#Use this instead of stdenv to build with clang #Use this instead of stdenv to build with clang
clangStdenv = if stdenv.isDarwin then stdenv else lowPrio (stdenvAdapters.overrideCC stdenv clang); clangStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.stdenv;
libcxxStdenv = stdenvAdapters.overrideCC stdenv (clangWrapSelf llvmPackages.clang); libcxxStdenv = stdenvAdapters.overrideCC stdenv (clangWrapSelf llvmPackages.clang-unwrapped);
clean = callPackage ../development/compilers/clean { }; clean = callPackage ../development/compilers/clean { };
@ -3756,7 +3756,8 @@ let
}; };
llvmPackages_36 = import ../development/compilers/llvm/3.6 { llvmPackages_36 = import ../development/compilers/llvm/3.6 {
inherit pkgs stdenv newScope fetchurl isl; inherit pkgs stdenv newScope fetchurl isl wrapCC;
inherit (stdenvAdapters) overrideCC;
}; };
manticore = callPackage ../development/compilers/manticore { }; manticore = callPackage ../development/compilers/manticore { };
@ -4837,8 +4838,8 @@ let
csslint = callPackage ../development/web/csslint { }; csslint = callPackage ../development/web/csslint { };
libcxx = llvmPackages_35.libcxx; libcxx = llvmPackages.libcxx;
libcxxabi = llvmPackages_35.libcxxabi; libcxxabi = llvmPackages.libcxxabi;
libsigrok = callPackage ../development/tools/libsigrok { }; libsigrok = callPackage ../development/tools/libsigrok { };