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

Fixing the attributes of gcc44 and gcc45, so the proper one is taken from

Browse Source 
stdenv


svn path=/nixpkgs/branches/stdenv-updates/; revision=22274
This commit is contained in:
Lluís Batlle i Rossell 2010-06-15 11:55:19 +00:00
parent 3f77d3da03
commit 0bc91e6322
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2067,8 +2067,6 @@ let
profiledCompiler = false; profiledCompiler = false;
}); });
gcc44 = useFromStdenv "gcc" gcc44_real;
gcc43 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.3) { gcc43 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.3) {
inherit stdenv fetchurl texinfo gmp mpfr noSysDirs; inherit stdenv fetchurl texinfo gmp mpfr noSysDirs;
profiledCompiler = true; profiledCompiler = true;
@ -2096,6 +2094,8 @@ let
cross = assert crossSystem != null; crossSystem; cross = assert crossSystem != null; crossSystem;
}); });
gcc45 = useFromStdenv "gcc" gcc45_real;
gcc45_realCross = lib.addMetaAttrs { platforms = []; } gcc45_realCross = lib.addMetaAttrs { platforms = []; }
(makeOverridable (import ../development/compilers/gcc-4.5) { (makeOverridable (import ../development/compilers/gcc-4.5) {
inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib
@ -2154,13 +2154,13 @@ let
enableMultilib = true; enableMultilib = true;
})); }));
gcc44_real = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.4) { gcc44 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.4) {
inherit fetchurl stdenv texinfo gmp mpfr /* ppl cloogppl */ inherit fetchurl stdenv texinfo gmp mpfr /* ppl cloogppl */
gettext which noSysDirs; gettext which noSysDirs;
profiledCompiler = true; profiledCompiler = true;
})); }));
gcc45 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.5) { gcc45_real = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.5) {
inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib perl inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib perl
ppl cloogppl ppl cloogppl
gettext which noSysDirs; gettext which noSysDirs;