diff options
author | Shea Levy <shea@shealevy.com> | 2015-03-07 12:51:06 +0000 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2015-03-07 12:51:06 +0000 |
commit | b37fd11351ed60eb8c2c83170d04bfe5364a3107 (patch) | |
tree | 05c47734658ab6c8c5bf1fd289a58a5f81d95138 /pkgs/development/compilers | |
parent | c62b5456f589f4e6970368563a0e711f221c0c4e (diff) | |
download | nixlib-b37fd11351ed60eb8c2c83170d04bfe5364a3107.tar nixlib-b37fd11351ed60eb8c2c83170d04bfe5364a3107.tar.gz nixlib-b37fd11351ed60eb8c2c83170d04bfe5364a3107.tar.bz2 nixlib-b37fd11351ed60eb8c2c83170d04bfe5364a3107.tar.lz nixlib-b37fd11351ed60eb8c2c83170d04bfe5364a3107.tar.xz nixlib-b37fd11351ed60eb8c2c83170d04bfe5364a3107.tar.zst nixlib-b37fd11351ed60eb8c2c83170d04bfe5364a3107.zip |
llvm-3.6 packages: Rearrange directory structure
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/llvm/3.6/clang/cmake-exports.patch (renamed from pkgs/development/compilers/llvm/3.6/clang-exports.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.6/clang/default.nix (renamed from pkgs/development/compilers/llvm/3.6/clang.nix) | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.6/clang/purity.patch (renamed from pkgs/development/compilers/llvm/3.6/clang-purity.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.6/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.6/libc++abi.nix (renamed from pkgs/development/compilers/llvm/3.6/libc++abi/default.nix) | 0 |
5 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/llvm/3.6/clang-exports.patch b/pkgs/development/compilers/llvm/3.6/clang/cmake-exports.patch index fbe9489d8e2c..fbe9489d8e2c 100644 --- a/pkgs/development/compilers/llvm/3.6/clang-exports.patch +++ b/pkgs/development/compilers/llvm/3.6/clang/cmake-exports.patch diff --git a/pkgs/development/compilers/llvm/3.6/clang.nix b/pkgs/development/compilers/llvm/3.6/clang/default.nix index 45ad74457122..2216dad3ef8e 100644 --- a/pkgs/development/compilers/llvm/3.6/clang.nix +++ b/pkgs/development/compilers/llvm/3.6/clang/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation { (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++ (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 = '' sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp diff --git a/pkgs/development/compilers/llvm/3.6/clang-purity.patch b/pkgs/development/compilers/llvm/3.6/clang/purity.patch index dc3b54e304fc..dc3b54e304fc 100644 --- a/pkgs/development/compilers/llvm/3.6/clang-purity.patch +++ b/pkgs/development/compilers/llvm/3.6/clang/purity.patch diff --git a/pkgs/development/compilers/llvm/3.6/default.nix b/pkgs/development/compilers/llvm/3.6/default.nix index a6f5d10d05d3..dddd09c44eda 100644 --- a/pkgs/development/compilers/llvm/3.6/default.nix +++ b/pkgs/development/compilers/llvm/3.6/default.nix @@ -18,7 +18,7 @@ let inherit compiler-rt_src; }; - clang = callPackage ./clang.nix { + clang = callPackage ./clang { inherit clang-tools-extra_src; }; @@ -26,6 +26,6 @@ let libcxx = callPackage ./libc++ { stdenv = pkgs.clangStdenv; }; - libcxxabi = callPackage ./libc++abi { stdenv = pkgs.clangStdenv; }; + libcxxabi = callPackage ./libc++abi.nix { stdenv = pkgs.clangStdenv; }; }; in self diff --git a/pkgs/development/compilers/llvm/3.6/libc++abi/default.nix b/pkgs/development/compilers/llvm/3.6/libc++abi.nix index ddc9c267edda..ddc9c267edda 100644 --- a/pkgs/development/compilers/llvm/3.6/libc++abi/default.nix +++ b/pkgs/development/compilers/llvm/3.6/libc++abi.nix |