diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-02-21 17:34:03 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-02-21 17:34:03 +0000 |
| commit | 67c961fd6343a9cadd78046100cbabb1203edc45 (patch) | |
| tree | 2b3df208c594f091afd038f978fa9d2a1517580c /pkgs/development/compilers | |
| parent | 3bcc70349b822d29d06600f66ce5d2deeb8fa0fb (diff) | |
| parent | 4050f8fa459d392c61aaf28a5a85212a5c0033f7 (diff) | |
| download | nixpkgs-67c961fd6343a9cadd78046100cbabb1203edc45.tar nixpkgs-67c961fd6343a9cadd78046100cbabb1203edc45.tar.gz nixpkgs-67c961fd6343a9cadd78046100cbabb1203edc45.tar.bz2 nixpkgs-67c961fd6343a9cadd78046100cbabb1203edc45.tar.lz nixpkgs-67c961fd6343a9cadd78046100cbabb1203edc45.tar.xz nixpkgs-67c961fd6343a9cadd78046100cbabb1203edc45.tar.zst nixpkgs-67c961fd6343a9cadd78046100cbabb1203edc45.zip | |
* Merged -r10790:HEAD from the trunk.
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10815
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/gcc-4.0/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc-4.1/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc-4.2/default.nix | 3 |
3 files changed, 10 insertions, 12 deletions
diff --git a/pkgs/development/compilers/gcc-4.0/default.nix b/pkgs/development/compilers/gcc-4.0/default.nix index 5d81ecbfd74..e25145cb623 100644 --- a/pkgs/development/compilers/gcc-4.0/default.nix +++ b/pkgs/development/compilers/gcc-4.0/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, noSysDirs , langC ? true, langCC ? true, langF77 ? false , profiledCompiler ? false -,gmp ? null , mpfr ? null +, gmp ? null , mpfr ? null +, texinfo ? null }: assert langC; @@ -21,10 +22,7 @@ stdenv.mkDerivation { inherit noSysDirs langC langCC langF77 profiledCompiler; - buildInputs = [] - ++ (if gmp != null then [gmp] else []) - ++ (if mpfr != null then [mpfr] else []) - ; + buildInputs = [gmp mpfr texinfo]; configureFlags = " --disable-multilib diff --git a/pkgs/development/compilers/gcc-4.1/default.nix b/pkgs/development/compilers/gcc-4.1/default.nix index 621f96e49f9..3034bd5da8f 100644 --- a/pkgs/development/compilers/gcc-4.1/default.nix +++ b/pkgs/development/compilers/gcc-4.1/default.nix @@ -4,13 +4,14 @@ , staticCompiler ? false , gmp ? null , mpfr ? null +, texinfo ? null }: assert langC || langF77; with import ../../../lib; -stdenv.mkDerivation ({ +stdenv.mkDerivation { name = "gcc-4.1.2"; builder = if langF77 then ./fortran.sh else ./builder.sh; @@ -33,6 +34,8 @@ stdenv.mkDerivation ({ inherit noSysDirs profiledCompiler staticCompiler; + buildInputs = [gmp mpfr texinfo]; + configureFlags = " --disable-multilib --disable-libstdcxx-pch @@ -62,9 +65,3 @@ stdenv.mkDerivation ({ priority = "7"; }; } - -// (if gmp != null || mpfr != null then { - buildInputs = [] - ++ (if gmp != null then [gmp] else []) - ++ (if mpfr != null then [mpfr] else []); -} else {})) diff --git a/pkgs/development/compilers/gcc-4.2/default.nix b/pkgs/development/compilers/gcc-4.2/default.nix index 7fcf7717c5a..8c442ddca0c 100644 --- a/pkgs/development/compilers/gcc-4.2/default.nix +++ b/pkgs/development/compilers/gcc-4.2/default.nix @@ -2,6 +2,7 @@ , langC ? true, langCC ? true, langF77 ? false , profiledCompiler ? false , staticCompiler ? false +, texinfo ? null }: assert langC; @@ -34,6 +35,8 @@ stdenv.mkDerivation { inherit noSysDirs profiledCompiler staticCompiler; + buildInputs = [texinfo]; + configureFlags = " --disable-multilib --disable-libstdcxx-pch |