Author: viric Date: 2010-06-14 14:02:14 +0000 (Mon, 14 Jun 2010) New Revision: 22258
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22258&view=rev Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix Log: Adding a new gcc in the middle of the linux stdenv build, so we can have a final stdenv gcc with ppl. Changes: Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix 2010-06-14 12:16:37 UTC (rev 22257) +++ nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix 2010-06-14 14:02:14 UTC (rev 22258) @@ -132,7 +132,12 @@ 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 # configure script happy. @@ -180,6 +185,17 @@ 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; + })); + }; + }; }; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
