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

rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc

Browse Source
This commit is contained in:
Eric Seidel
2015-01-14 20:27:55 -08:00
parent 16fe4be790
commit f3c6827373
89 changed files with 137 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/llvm/3.3/clang.nix
+2 -2
View File
@@ -2,7 +2,7 @@
let
version = "3.3";
gccReal = if (stdenv.cc.gcc or null) == null then stdenv.cc else stdenv.cc.gcc;
gccReal = if (stdenv.cc.cc or null) == null then stdenv.cc else stdenv.cc.cc;
in
stdenv.mkDerivation {
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
sha256 = "15mrvw43s4frk1j49qr4v5viq68h8qlf10qs6ghd6mrsmgj5vddi";
};
passthru = { gcc = stdenv.cc.gcc; };
passthru = { cc = stdenv.cc.cc; };
meta = {
homepage = http://clang.llvm.org/;
pkgs/development/compilers/llvm/3.4/clang.nix
+2 -2
View File
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
"-DCLANG_PATH_TO_LLVM_BUILD=${llvm}"
] ++
(stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include") ++
(stdenv.lib.optional (stdenv.cc.gcc != null) "-DGCC_INSTALL_PREFIX=${stdenv.cc.gcc}");
(stdenv.lib.optional (stdenv.cc.cc != null) "-DGCC_INSTALL_PREFIX=${stdenv.cc.cc}");
# Clang expects to find LLVMgold in its own prefix
# Clang expects to find sanitizer libraries in its own prefix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
'';
passthru.gcc = stdenv.cc.gcc;
passthru.cc = stdenv.cc.cc;
enableParallelBuilding = true;