diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-12-14 14:07:23 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-12-14 14:07:23 +0000 |
commit | 9eb4c4ddef57a82385de4ba7bf45e798d7ec6cbf (patch) | |
tree | 7080573563363f7a41ffa9358c87ac3e4d443db5 /pkgs | |
parent | 594dec7c7fc8b9a935d826911759986bc0cbdf0c (diff) |
* GCC 4.6: drop the cloog-ppl backend, which seems obsolete.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30889
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/compilers/gcc-4.6/default.nix | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc-4.6/default.nix index 4faa531f10d5e..9ae3501491630 100644 --- a/pkgs/development/compilers/gcc-4.6/default.nix +++ b/pkgs/development/compilers/gcc-4.6/default.nix @@ -11,7 +11,7 @@ , perl ? null # optional, for texi2pod (then pod2man); required for Java , gmp, mpfr, mpc, gettext, which , libelf # optional, for link-time optimizations (LTO) -, ppl ? null, cloogppl ? null, cloog ? null # optional, for the Graphite optimization framework. Cannot pass both cloog and cloogppl +, ppl ? null, cloog ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null @@ -38,9 +38,6 @@ assert langVhdl -> gnat != null; # LTO needs libelf and zlib. assert libelf != null -> zlib != null; -# Cannot use both cloog and cloog-ppl -assert cloog != null -> cloogppl == null; - with stdenv.lib; with builtins; @@ -216,7 +213,6 @@ stdenv.mkDerivation ({ buildInputs = [ gmp mpfr mpc libelf ] ++ (optional (ppl != null) ppl) - ++ (optional (cloogppl != null) cloogppl) ++ (optional (cloog != null) cloog) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) @@ -227,14 +223,13 @@ stdenv.mkDerivation ({ ; configureFlagsArray = stdenv.lib.optionals - (ppl != null && ppl.dontDisableStatic == true) + (ppl != null && ppl ? dontDisableStatic && ppl.dontDisableStatic) [ "--with-host-libstdcxx=-lstdc++ -lgcc_s" ]; configureFlags = " ${if enableMultilib then "" else "--disable-multilib"} ${if enableShared then "" else "--disable-shared"} ${if ppl != null then "--with-ppl=${ppl}" else ""} - ${if cloogppl != null then "--with-cloog=${cloogppl}" else ""} ${if cloog != null then "--with-cloog=${cloog} --enable-cloog-backend=isl" else ""} @@ -297,7 +292,6 @@ stdenv.mkDerivation ({ ${if enableMultilib then "" else "--disable-multilib"} ${if enableShared then "" else "--disable-shared"} ${if ppl != null then "--with-ppl=${ppl.hostDrv}" else ""} - ${if cloogppl != null then "--with-cloog=${cloogppl.hostDrv}" else ""} ${if cloog != null then "--with-cloog=${cloog.hostDrv} --enable-cloog-backend=isl" else ""} ${if langJava then "--with-ecj-jar=${javaEcj.hostDrv}" else ""} ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} |