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

Reverting r22258. I got confused; we don't need a new gcc build in stdenvLinux,

Browse Source 
but an up to date ppl package (because the current does not build with such a
new gmp)


svn path=/nixpkgs/branches/stdenv-updates/; revision=22267
This commit is contained in:
Lluís Batlle i Rossell 2010-06-14 21:40:11 +00:00
parent 0feaada94a
commit d30ede1a13
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/stdenv/linux/default.nix
View File

@ -132,11 +132,6 @@ rec {
stdenv = stdenvLinuxBoot0; stdenv = stdenvLinuxBoot0;
}; };
# Helper function to override the compiler in stdenv for specific packages.
overrideGCC = stdenv: gcc: stdenv //
{ mkDerivation = args: stdenv.mkDerivation (args // { NIX_GCC = gcc; });
};
# Create the first "real" standard environment. This one consists # Create the first "real" standard environment. This one consists
# of bootstrap tools only, and a minimal Glibc to keep the GCC # of bootstrap tools only, and a minimal Glibc to keep the GCC
@ -185,17 +180,6 @@ rec {
stdenvLinuxBoot2Pkgs = allPackages { stdenvLinuxBoot2Pkgs = allPackages {
inherit system; inherit system;
bootStdenv = stdenvLinuxBoot2; bootStdenv = stdenvLinuxBoot2;
config = {
packageOverrides = pkgs : {
# The stdenv's gcc will not be built with 'ppl'
# but the resulting 'gcc' attribute of these pkgs will.
# (that allows bootstrapping from bootstrapTools with old gmp)
stdenv = overrideGCC pkgs.stdenv (pkgs.wrapGCC (pkgs.gcc.gcc.override {
ppl = null;
cloogppl = null;
}));
};
};
}; };