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

move libcxx[abi] into llvm tree

Browse Source
This commit is contained in:
Eric Seidel 2015-02-03 14:41:12 -08:00
parent fe49487a05
commit 4a467ec02b
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/llvm/3.5/default.nix
View File

@ -1,4 +1,4 @@
{ newScope, stdenv, isl, fetchurl }: { pkgs, newScope, stdenv, isl, fetchurl }:
let let
callPackage = newScope (self // { inherit stdenv isl version fetch; }); callPackage = newScope (self // { inherit stdenv isl version fetch; });
@ -33,5 +33,9 @@ let
polly = callPackage ./polly.nix {}; polly = callPackage ./polly.nix {};
dragonegg = callPackage ./dragonegg.nix {}; dragonegg = callPackage ./dragonegg.nix {};
libcxx = callPackage ./libc++ { stdenv = pkgs.clangStdenv; };
libcxxabi = callPackage ./libc++abi { stdenv = pkgs.clangStdenv; };
}; };
in self in self

0
pkgs/development/libraries/libc++/darwin.patch → pkgs/development/compilers/llvm/3.5/libc++/darwin.patch
View File

3
pkgs/development/libraries/libc++/default.nix → pkgs/development/compilers/llvm/3.5/libc++/default.nix
View File

@ -36,9 +36,6 @@ stdenv.mkDerivation rec {
inherit libcxxabi; inherit libcxxabi;
# Remove a Makefile that causes many retained dependencies.
postInstall = "rm $out/include/c++/v1/Makefile";
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
meta = { meta = {

0
pkgs/development/libraries/libc++/setup-hook.sh → pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh
View File

0
pkgs/development/libraries/libc++abi/darwin.patch → pkgs/development/compilers/llvm/3.5/libc++abi/darwin.patch
View File

0
pkgs/development/libraries/libc++abi/default.nix → pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
View File

0
pkgs/development/libraries/libc++abi/no-stdc++.patch → pkgs/development/compilers/llvm/3.5/libc++abi/no-stdc++.patch
View File

3
pkgs/stdenv/darwin/default.nix
View File

@ -130,10 +130,9 @@ rec {
cc = pkgs.llvmPackages.clang; cc = pkgs.llvmPackages.clang;
coreutils = pkgs.coreutils; coreutils = pkgs.coreutils;
shell = "${pkgs.bash}/bin/bash"; shell = "${pkgs.bash}/bin/bash";
extraPackages = [ pkgs.libcxx ];
}; };
extraBuildInputs = [ pkgs.libcxx ];
shell = "${pkgs.bash}/bin/bash"; shell = "${pkgs.bash}/bin/bash";
}; };

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

@ -3638,7 +3638,7 @@ let
llvm_v = path: callPackage path { }; llvm_v = path: callPackage path { };
llvmPackages = llvmPackages_35; llvmPackages = if stdenv.isDarwin then llvmPackages_35 else llvmPackages_34;
llvmPackages_34 = recurseIntoAttrs (import ../development/compilers/llvm/3.4 { llvmPackages_34 = recurseIntoAttrs (import ../development/compilers/llvm/3.4 {
inherit stdenv newScope fetchurl; inherit stdenv newScope fetchurl;
@ -3647,7 +3647,7 @@ let
llvmPackagesSelf = import ../development/compilers/llvm/3.4 { inherit newScope fetchurl; isl = isl_0_12; stdenv = libcxxStdenv; }; llvmPackagesSelf = import ../development/compilers/llvm/3.4 { inherit newScope fetchurl; isl = isl_0_12; stdenv = libcxxStdenv; };
llvmPackages_35 = import ../development/compilers/llvm/3.5 { llvmPackages_35 = import ../development/compilers/llvm/3.5 {
inherit stdenv newScope fetchurl isl; inherit pkgs stdenv newScope fetchurl isl;
}; };
manticore = callPackage ../development/compilers/manticore { }; manticore = callPackage ../development/compilers/manticore { };
@ -4685,8 +4685,8 @@ let
csslint = callPackage ../development/web/csslint { }; csslint = callPackage ../development/web/csslint { };
libcxx = callPackage ../development/libraries/libc++ { stdenv = pkgs.clangStdenv; }; libcxx = llvmPackages_35.libcxx;
libcxxabi = callPackage ../development/libraries/libc++abi { stdenv = pkgs.clangStdenv; }; libcxxabi = llvmPackages_35.libcxxabi;
libsigrok = callPackage ../development/tools/libsigrok { }; libsigrok = callPackage ../development/tools/libsigrok { };