diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2011-08-02 16:02:53 +0000 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2011-08-02 16:02:53 +0000 |
| commit | bf68854ff40ad5095f4bfc91ed237be28016afd9 (patch) | |
| tree | 44baf71dc8d3f9006b873531818b21c7d816e8f5 /pkgs | |
| parent | 23e9cfac655fa7b2989925c70b865fe2853799c9 (diff) | |
make gcc 4.1 compile
svn path=/nixpkgs/trunk/; revision=28124
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/gcc-4.1/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc-4.1/default.nix b/pkgs/development/compilers/gcc-4.1/default.nix index c11c76acc89c8..66bf48cb6e12a 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 939d8c4a345f2..9797809b9dac7 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; }); |