Making gcc 4.6 that of stdenv.

svn path=/nixpkgs/branches/stdenv-updates/; revision=28958
This commit is contained in:
Lluís Batlle i Rossell 2011-09-01 14:28:13 +00:00
parent 9c37762551
commit bff99fe8b5
2 changed files with 6 additions and 3 deletions

View File

@ -218,10 +218,13 @@ rec {
static = true; static = true;
}; };
}; };
cloogppl = stdenvLinuxBoot3Pkgs.cloogppl.override { cloog = stdenvLinuxBoot3Pkgs.cloog.override {
inherit ppl; isl = stdenvLinuxBoot3Pkgs.isl.override {
static = true;
};
static = true; static = true;
}; };
cloogppl = null;
}); });
# 8) Construct a fourth stdenv identical to the second, except that # 8) Construct a fourth stdenv identical to the second, except that

View File

@ -1642,7 +1642,7 @@ let
gambit = callPackage ../development/compilers/gambit { }; gambit = callPackage ../development/compilers/gambit { };
gcc = gcc45; gcc = gcc46;
gcc295 = wrapGCC (import ../development/compilers/gcc-2.95 { gcc295 = wrapGCC (import ../development/compilers/gcc-2.95 {
inherit fetchurl stdenv noSysDirs; inherit fetchurl stdenv noSysDirs;