* 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,15 +1,4 @@
|
||||
{ fetchurl, stdenv, ppl, static ? false }:
|
||||
|
||||
let
|
||||
|
||||
# --with-host-libstdcxx helps when *ppl* is built statically.
|
||||
# But I will suppose that this is statically built only when ppl is also
|
||||
# statically built.
|
||||
staticFlags =
|
||||
assert static -> ppl.dontDisableStatic == true;
|
||||
if static then " --enable-static --disable-shared --with-host-libstdcxx=-lstdc++" else "";
|
||||
|
||||
in
|
||||
{ fetchurl, stdenv, ppl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cloog-ppl-0.15.11";
|
||||
@@ -21,11 +10,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
propagatedBuildInputs = [ ppl ];
|
||||
|
||||
configureFlags = "--with-ppl=${ppl}" + staticFlags;
|
||||
dontDisableStatic = if static then true else false;
|
||||
configureFlags = "--with-ppl=${ppl}";
|
||||
|
||||
crossAttrs = {
|
||||
configureFlags = "--with-ppl=${ppl.hostDrv}" + staticFlags;
|
||||
configureFlags = "--with-ppl=${ppl.hostDrv}";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
Reference in New Issue
Block a user