diff options
author | Ludovic Courtès <ludo@gnu.org> | 2009-07-18 21:37:23 +0000 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2009-07-18 21:37:23 +0000 |
commit | 34bd10567ba7852ca9ce3b95b668e8a0f3bf3f24 (patch) | |
tree | 16e85d4ea89fee58ab790d75e756435c28b80b27 | |
parent | 39efe36121ea9ac86b463d01bbe4cd60aeedc80f (diff) | |
download | nixlib-34bd10567ba7852ca9ce3b95b668e8a0f3bf3f24.tar nixlib-34bd10567ba7852ca9ce3b95b668e8a0f3bf3f24.tar.gz nixlib-34bd10567ba7852ca9ce3b95b668e8a0f3bf3f24.tar.bz2 nixlib-34bd10567ba7852ca9ce3b95b668e8a0f3bf3f24.tar.lz nixlib-34bd10567ba7852ca9ce3b95b668e8a0f3bf3f24.tar.xz nixlib-34bd10567ba7852ca9ce3b95b668e8a0f3bf3f24.tar.zst nixlib-34bd10567ba7852ca9ce3b95b668e8a0f3bf3f24.zip |
GCC 4.4: Enable Graphite by building against PPL and GLooG.
svn path=/nixpkgs/trunk/; revision=16424
-rw-r--r-- | pkgs/development/compilers/gcc-4.4/default.nix | 5 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc-4.4/default.nix index 2b26b9b01a32..f55f62a9fa6e 100644 --- a/pkgs/development/compilers/gcc-4.4/default.nix +++ b/pkgs/development/compilers/gcc-4.4/default.nix @@ -5,6 +5,7 @@ , staticCompiler ? false , texinfo ? null , gmp, mpfr, gettext +, ppl ? null, cloogppl ? null # used by the Graphite optimization framework , bison ? null, flex ? null , zlib ? null, boehmgc ? null , enableMultilib ? false @@ -68,6 +69,8 @@ stdenv.mkDerivation ({ inherit noSysDirs profiledCompiler staticCompiler; buildInputs = [ texinfo gmp mpfr gettext ] + ++ (optional (ppl != null) ppl) + ++ (optional (cloogppl != null) cloogppl) ++ (optionals langTreelang [bison flex]) ++ (optional (zlib != null) zlib) ++ (optional (boehmgc != null) boehmgc) @@ -75,6 +78,8 @@ stdenv.mkDerivation ({ configureFlags = " ${if enableMultilib then "" else "--disable-multilib"} + ${if ppl != null then "--with-ppl=${ppl}" else ""} + ${if cloogppl != null then "--with-cloog=${cloogppl}" else ""} --disable-libstdcxx-pch --without-included-gettext --with-system-zlib diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c3089fdd85c..cfafffe7aba1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1669,7 +1669,8 @@ let })); gcc44 = wrapGCC (makeOverridable (import ../development/compilers/gcc-4.4) { - inherit fetchurl stdenv texinfo gmp mpfr gettext noSysDirs; + inherit fetchurl stdenv texinfo gmp mpfr ppl cloogppl + gettext noSysDirs; profiledCompiler = true; }); |