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

Fix fallout of recent cc-wrapper changes

Browse Source 
Fixes tarball except for 56e21d05e874a29ad0d51aea18e8c982c7c826f3
This commit is contained in:
Shea Levy 2015-03-24 22:13:43 -04:00
parent e104a7870f
commit 6e3c9d5ce4
8 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/gcc/3.4/default.nix
View File

@ -37,7 +37,7 @@ stdenv.mkDerivation {
} }
"; ";
passthru = { inherit langC langCC langF77; }; passthru = { inherit langC langCC langF77; isGNU = true; };
meta = { meta = {
homepage = "http://gcc.gnu.org/"; homepage = "http://gcc.gnu.org/";

2
pkgs/development/compilers/gcc/4.3/default.nix
View File

@ -171,6 +171,8 @@ stdenv.mkDerivation ({
rm -Rf ghdl-* rm -Rf ghdl-*
''; '';
passthru.isGNU = true;
meta = { meta = {
homepage = "http://ghdl.free.fr/"; homepage = "http://ghdl.free.fr/";
license = stdenv.lib.licenses.gpl2Plus; license = stdenv.lib.licenses.gpl2Plus;

2
pkgs/development/compilers/gcc/4.4/default.nix
View File

@ -243,7 +243,7 @@ stdenv.mkDerivation ({
passthru = { inherit langC langCC langAda langFortran langVhdl passthru = { inherit langC langCC langAda langFortran langVhdl
enableMultilib version; }; enableMultilib version; isGNU = true; };
# ghdl does not build fine with parallel building # ghdl does not build fine with parallel building
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46173 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46173

2
pkgs/development/compilers/gcc/4.5/default.nix
View File

@ -358,7 +358,7 @@ stdenv.mkDerivation ({
else null; else null;
passthru = { inherit langC langCC langAda langFortran langVhdl passthru = { inherit langC langCC langAda langFortran langVhdl
enableMultilib version; }; enableMultilib version; isGNU = true; };
enableParallelBuilding = !langAda; enableParallelBuilding = !langAda;

2
pkgs/development/compilers/gcc/4.6/default.nix
View File

@ -427,7 +427,7 @@ stdenv.mkDerivation ({
else null; else null;
passthru = { inherit langC langCC langAda langFortran langVhdl passthru = { inherit langC langCC langAda langFortran langVhdl
langGo version; }; langGo version; isGNU = true; };
enableParallelBuilding = false; enableParallelBuilding = false;

2
pkgs/development/compilers/llvm/3.3/clang.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation {
sha256 = "15mrvw43s4frk1j49qr4v5viq68h8qlf10qs6ghd6mrsmgj5vddi"; sha256 = "15mrvw43s4frk1j49qr4v5viq68h8qlf10qs6ghd6mrsmgj5vddi";
}; };
passthru = { cc = stdenv.cc.cc; }; passthru = { cc = stdenv.cc.cc; gcc = gccReal; };
meta = { meta = {
homepage = http://clang.llvm.org/; homepage = http://clang.llvm.org/;

3
pkgs/development/compilers/llvm/3.4/clang.nix
View File

@ -35,6 +35,9 @@ stdenv.mkDerivation {
''; '';
passthru.cc = stdenv.cc.cc; passthru.cc = stdenv.cc.cc;
# GCC_INSTALL_PREFIX points here, so just use it even though it may not
# actually be a gcc
passthru.gcc = stdenv.cc.cc;
enableParallelBuilding = true; enableParallelBuilding = true;

2
pkgs/development/tools/misc/distcc/default.nix
View File

@ -41,7 +41,7 @@ let
# #
# extraConfig is meant to be sh lines exporting environment # extraConfig is meant to be sh lines exporting environment
# variables like DISTCC_HOSTS, DISTCC_DIR, ... # variables like DISTCC_HOSTS, DISTCC_DIR, ...
links = extraConfig : (runCommand "distcc-links" { } links = extraConfig: (runCommand "distcc-links" { passthru.gcc = gcc.cc; }
'' ''
mkdir -p $out/bin mkdir -p $out/bin
if [ -x "${gcc.cc}/bin/gcc" ]; then if [ -x "${gcc.cc}/bin/gcc" ]; then