* Streamline the stdenv bootstrap and resulting closure by removing
some redundant builds (e.g., GMP was built three times). * Updated GMP to 5.0.2. * Updated PPL to 0.11.2. * Remove ad hoc flags to build GCC's dependencies statically. Instead, use the ‘makeStaticLibraries’ stdenv adapter. * Build GMP with C++ support by default. svn path=/nixpkgs/branches/stdenv-updates/; revision=30891
This commit is contained in:
@@ -1,6 +1,4 @@
|
||||
{ fetchurl, stdenv, gmp, isl, static ? false }:
|
||||
|
||||
assert static -> isl.dontDisableStatic;
|
||||
{ fetchurl, stdenv, gmp, isl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cloog-0.16.3";
|
||||
@@ -14,10 +12,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
propagatedBuildInputs = [ isl ];
|
||||
|
||||
configureFlags = [ "--with-isl=system" ]
|
||||
++ (stdenv.lib.optionals static [ "--enable-static" "--disable-shared" ]);
|
||||
|
||||
dontDisableStatic = static;
|
||||
configureFlags = [ "--with-isl=system" ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user