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

gcc: Fix building 4.5 and 4.6

Browse Source
This commit is contained in:
Eelco Dolstra 2014-01-13 19:11:46 +01:00
parent bccc76f290
commit 033374d601
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,7 +212,7 @@ stdenv.mkDerivation ({
++ (optional (ppl != null) ppl) ++ (optional (ppl != null) ppl)
++ (optional (cloogppl != null) cloogppl) ++ (optional (cloogppl != null) cloogppl)
++ (optional (zlib != null) zlib) ++ (optional (zlib != null) zlib)
++ (optional (boehmgc != null) boehmgc) ++ (optional langJava boehmgc)
++ (optionals langJava [zip unzip]) ++ (optionals langJava [zip unzip])
++ (optionals javaAwtGtk ([gtk pkgconfig libart_lgpl] ++ xlibs)) ++ (optionals javaAwtGtk ([gtk pkgconfig libart_lgpl] ++ xlibs))
++ (optionals (cross != null) [binutilsCross]) ++ (optionals (cross != null) [binutilsCross])

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

@ -434,7 +434,7 @@ stdenv.mkDerivation ({
passthru = { inherit langC langCC langAda langFortran langVhdl passthru = { inherit langC langCC langAda langFortran langVhdl
langGo version; }; langGo version; };
enableParallelBuilding = !langAda; enableParallelBuilding = false;
inherit (stdenv) is64bit; inherit (stdenv) is64bit;

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

@ -2437,11 +2437,14 @@ let
profiledCompiler = true; profiledCompiler = true;
})); }));
gcc45 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.5) { gcc45 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.5 {
inherit fetchurl stdenv gmp mpfr mpc libelf zlib perl inherit fetchurl stdenv gmp mpfr mpc libelf zlib perl
ppl cloogppl
gettext which noSysDirs; gettext which noSysDirs;
texinfo = texinfo4; texinfo = texinfo4;
ppl = null;
cloogppl = null;
# bootstrapping a profiled compiler does not work in the sheevaplug: # bootstrapping a profiled compiler does not work in the sheevaplug:
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
profiledCompiler = !stdenv.isArm; profiledCompiler = !stdenv.isArm;
@ -2460,6 +2463,9 @@ let
gcc46 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.6 { gcc46 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.6 {
inherit noSysDirs; inherit noSysDirs;
ppl = null;
cloog = null;
# bootstrapping a profiled compiler does not work in the sheevaplug: # bootstrapping a profiled compiler does not work in the sheevaplug:
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
profiledCompiler = false; profiledCompiler = false;