mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-16 06:47:09 +03:00
Fixing the attributes of gcc44 and gcc45, so the proper one is taken from
stdenv svn path=/nixpkgs/branches/stdenv-updates/; revision=22274
This commit is contained in:
parent
3f77d3da03
commit
0bc91e6322
@ -2067,8 +2067,6 @@ let
|
||||
profiledCompiler = false;
|
||||
});
|
||||
|
||||
gcc44 = useFromStdenv "gcc" gcc44_real;
|
||||
|
||||
gcc43 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.3) {
|
||||
inherit stdenv fetchurl texinfo gmp mpfr noSysDirs;
|
||||
profiledCompiler = true;
|
||||
@ -2096,6 +2094,8 @@ let
|
||||
cross = assert crossSystem != null; crossSystem;
|
||||
});
|
||||
|
||||
gcc45 = useFromStdenv "gcc" gcc45_real;
|
||||
|
||||
gcc45_realCross = lib.addMetaAttrs { platforms = []; }
|
||||
(makeOverridable (import ../development/compilers/gcc-4.5) {
|
||||
inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib
|
||||
@ -2154,13 +2154,13 @@ let
|
||||
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 */
|
||||
gettext which noSysDirs;
|
||||
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
|
||||
ppl cloogppl
|
||||
gettext which noSysDirs;
|
||||
|
Loading…
Reference in New Issue
Block a user