diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-12-14 14:31:56 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-12-14 14:31:56 +0000 |
| commit | cfde88976ba4cddd01b1bb28b40afd12ea93a11d (patch) | |
| tree | 71b2dcebf820baafe7e54114f37e274e2a01da47 /pkgs/development/libraries/cloog | |
| parent | 9eb4c4ddef57a82385de4ba7bf45e798d7ec6cbf (diff) | |
| download | nixpkgs-cfde88976ba4cddd01b1bb28b40afd12ea93a11d.tar nixpkgs-cfde88976ba4cddd01b1bb28b40afd12ea93a11d.tar.gz nixpkgs-cfde88976ba4cddd01b1bb28b40afd12ea93a11d.tar.bz2 nixpkgs-cfde88976ba4cddd01b1bb28b40afd12ea93a11d.tar.lz nixpkgs-cfde88976ba4cddd01b1bb28b40afd12ea93a11d.tar.xz nixpkgs-cfde88976ba4cddd01b1bb28b40afd12ea93a11d.tar.zst nixpkgs-cfde88976ba4cddd01b1bb28b40afd12ea93a11d.zip | |
* 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
Diffstat (limited to 'pkgs/development/libraries/cloog')
| -rw-r--r-- | pkgs/development/libraries/cloog/default.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix index 7bd0d68c3ec..ab5737b20ed 100644 --- a/pkgs/development/libraries/cloog/default.nix +++ b/pkgs/development/libraries/cloog/default.nix @@ -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; |