From bf68854ff40ad5095f4bfc91ed237be28016afd9 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 2 Aug 2011 16:02:53 +0000 Subject: [PATCH] make gcc 4.1 compile svn path=/nixpkgs/trunk/; revision=28124 --- pkgs/development/compilers/gcc-4.1/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc-4.1/default.nix b/pkgs/development/compilers/gcc-4.1/default.nix index c11c76acc89c..66bf48cb6e12 100644 --- a/pkgs/development/compilers/gcc-4.1/default.nix +++ b/pkgs/development/compilers/gcc-4.1/default.nix @@ -37,6 +37,8 @@ stdenv.mkDerivation { inherit noSysDirs profiledCompiler staticCompiler; buildInputs = [gmp mpfr texinfo]; + + enableParallelBuilding = true; configureFlags = " --disable-multilib diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 939d8c4a345f..9797809b9dac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1660,7 +1660,8 @@ let }); gcc41 = wrapGCC (makeOverridable (import ../development/compilers/gcc-4.1) { - inherit fetchurl stdenv noSysDirs; + inherit fetchurl noSysDirs gmp mpfr; + stdenv = overrideGCC stdenv gcc42; texinfo = texinfo49; profiledCompiler = false; });