Author: eelco
Date: Wed Dec 14 14:07:23 2011
New Revision: 30889
URL: https://nixos.org/websvn/nix/?rev=30889&sc=1
Log:
* GCC 4.6: drop the cloog-ppl backend, which seems obsolete.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.6/default.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.6/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.6/default.nix
Wed Dec 14 14:05:22 2011 (r30888)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.6/default.nix
Wed Dec 14 14:07:23 2011 (r30889)
@@ -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 @@
# 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 @@
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 @@
;
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 @@
${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 ""}
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
