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

llvm-3.6 packages: Rearrange directory structure

Browse Source
This commit is contained in:
Shea Levy 2015-03-07 12:51:06 +00:00
parent c62b5456f5
commit b37fd11351
5 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/development/compilers/llvm/3.6/clang-exports.patch → pkgs/development/compilers/llvm/3.6/clang/cmake-exports.patch
View File

2
pkgs/development/compilers/llvm/3.6/clang.nix → pkgs/development/compilers/llvm/3.6/clang/default.nix
View File

@ -23,7 +23,7 @@ in stdenv.mkDerivation {
(stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++ (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++
(stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"); (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include");
patches = [ ./clang-purity.patch ./clang-exports.patch ]; patches = [ ./purity.patch ./cmake-exports.patch ];
postPatch = '' postPatch = ''
sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp

0
pkgs/development/compilers/llvm/3.6/clang-purity.patch → pkgs/development/compilers/llvm/3.6/clang/purity.patch
View File

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

@ -18,7 +18,7 @@ let
inherit compiler-rt_src; inherit compiler-rt_src;
}; };
clang = callPackage ./clang.nix { clang = callPackage ./clang {
inherit clang-tools-extra_src; inherit clang-tools-extra_src;
}; };
@ -26,6 +26,6 @@ let
libcxx = callPackage ./libc++ { stdenv = pkgs.clangStdenv; }; libcxx = callPackage ./libc++ { stdenv = pkgs.clangStdenv; };
libcxxabi = callPackage ./libc++abi { stdenv = pkgs.clangStdenv; }; libcxxabi = callPackage ./libc++abi.nix { stdenv = pkgs.clangStdenv; };
}; };
in self in self

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