diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2011-09-01 14:28:13 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2011-09-01 14:28:13 +0000 |
| commit | bff99fe8b52c5a0c19bc298b86549a470c578fb3 (patch) | |
| tree | cdd91627134a4aee9d6e14fad20dc81983d90a60 /pkgs | |
| parent | 9c37762551a5edba9d13f04082245d288ab3f4dc (diff) | |
| download | nixlib-bff99fe8b52c5a0c19bc298b86549a470c578fb3.tar nixlib-bff99fe8b52c5a0c19bc298b86549a470c578fb3.tar.gz nixlib-bff99fe8b52c5a0c19bc298b86549a470c578fb3.tar.bz2 nixlib-bff99fe8b52c5a0c19bc298b86549a470c578fb3.tar.lz nixlib-bff99fe8b52c5a0c19bc298b86549a470c578fb3.tar.xz nixlib-bff99fe8b52c5a0c19bc298b86549a470c578fb3.tar.zst nixlib-bff99fe8b52c5a0c19bc298b86549a470c578fb3.zip | |
Making gcc 4.6 that of stdenv.
svn path=/nixpkgs/branches/stdenv-updates/; revision=28958
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index ce10399eb5d5..315c0895d202 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -218,10 +218,13 @@ rec { static = true; }; }; - cloogppl = stdenvLinuxBoot3Pkgs.cloogppl.override { - inherit ppl; + cloog = stdenvLinuxBoot3Pkgs.cloog.override { + isl = stdenvLinuxBoot3Pkgs.isl.override { + static = true; + }; static = true; }; + cloogppl = null; }); # 8) Construct a fourth stdenv identical to the second, except that diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fec298e6ae8..4dbc58aa27dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1642,7 +1642,7 @@ let gambit = callPackage ../development/compilers/gambit { }; - gcc = gcc45; + gcc = gcc46; gcc295 = wrapGCC (import ../development/compilers/gcc-2.95 { inherit fetchurl stdenv noSysDirs; |