mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 13:10:33 +00:00
Adding a new gcc in the middle of the linux stdenv build, so we can have a
final stdenv gcc with ppl. svn path=/nixpkgs/branches/stdenv-updates/; revision=22258
This commit is contained in:
parent
4afd41a6b6
commit
0feaada94a
|
@ -132,6 +132,11 @@ rec {
|
|||
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
|
||||
# of bootstrap tools only, and a minimal Glibc to keep the GCC
|
||||
|
@ -180,6 +185,17 @@ rec {
|
|||
stdenvLinuxBoot2Pkgs = allPackages {
|
||||
inherit system;
|
||||
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;
|
||||
}));
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue